diff --git a/Gemini-iOS/ContentView.swift b/Gemini-iOS/ContentView.swift index 890ed89..a3e338a 100644 --- a/Gemini-iOS/ContentView.swift +++ b/Gemini-iOS/ContentView.swift @@ -49,11 +49,16 @@ struct ContentView: View { // It's not actually user scrolling, and this screws up our animation, so we ignore it. guard abs(delta) != outer.safeAreaInsets.top else { return } - if delta != 0 { - barOffset += delta + if scrollOffset < 0 { + barOffset = 0 + } else { + if delta != 0 { + barOffset += delta + } + + print(barOffset) + barOffset = max(0, min(navBarHeight + outer.safeAreaInsets.top, barOffset)) } - - barOffset = max(0, min(navBarHeight + outer.safeAreaInsets.top, barOffset)) } } @@ -63,7 +68,7 @@ struct ContentView: View { Color.clear.preference(key: NavBarHeightPrefKey.self, value: geom.frame(in: .global).height) }) .offset(y: -barOffset) - + Spacer() ToolBar(navigator: navigator, shareCurrentURL: shareCurrentURL) diff --git a/Gemini.xcodeproj/xcshareddata/xcschemes/Gemini-iOS.xcscheme b/Gemini.xcodeproj/xcshareddata/xcschemes/Gemini-iOS.xcscheme index abca248..19c1dc8 100644 --- a/Gemini.xcodeproj/xcshareddata/xcschemes/Gemini-iOS.xcscheme +++ b/Gemini.xcodeproj/xcshareddata/xcschemes/Gemini-iOS.xcscheme @@ -59,7 +59,7 @@ + isEnabled = "NO">