shadowfacts
/
Gemini
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fix keyboard not being dismissed in some circumstances

This commit is contained in:
Shadowfacts 2020-12-20 15:25:52 -05:00
parent 040a799b7b
commit e27ac15635
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Gemini-iOS/BrowserNavigationController.swift
View File

@ -34,6 +34,10 @@ class BrowserNavigationController: UIViewController {
if (oldValue <= 0.5 && toolbarOffset > 0.5) || (oldValue > 0.5 && toolbarOffset <= 0.5) { if (oldValue <= 0.5 && toolbarOffset > 0.5) || (oldValue > 0.5 && toolbarOffset <= 0.5) {
setNeedsStatusBarAppearanceUpdate() setNeedsStatusBarAppearanceUpdate()
if navBarView.textField.isFirstResponder {
navBarView.textField.resignFirstResponder()
}
} }
} }
} }
@ -205,6 +209,10 @@ class BrowserNavigationController: UIViewController {
if position == .end { if position == .end {
self.navigator.goBack() self.navigator.goBack()
} }
if self.navBarView.textField.isFirstResponder {
self.navBarView.textField.resignFirstResponder()
}
} }
gestureState = .backwards(animator) gestureState = .backwards(animator)
} else if location.x > view.bounds.width - startEdgeNavigationSwipeDistance && velocity.x < 0 && navigator.forwardStack.count > 0 { } else if location.x > view.bounds.width - startEdgeNavigationSwipeDistance && velocity.x < 0 && navigator.forwardStack.count > 0 {
@ -236,6 +244,10 @@ class BrowserNavigationController: UIViewController {
if position == .end { if position == .end {
self.navigator.goForward() self.navigator.goForward()
} }
if self.navBarView.textField.isFirstResponder {
self.navBarView.textField.resignFirstResponder()
}
} }
gestureState = .forwards(animator) gestureState = .forwards(animator)
} }

1
Gemini-iOS/BrowserWebViewController.swift
View File

@ -81,6 +81,7 @@ class BrowserWebViewController: UIViewController {
webView.scrollView.delegate = scrollViewDelegate webView.scrollView.delegate = scrollViewDelegate
// this doesn't default to .default :S // this doesn't default to .default :S
webView.scrollView.indicatorStyle = .default webView.scrollView.indicatorStyle = .default
webView.scrollView.keyboardDismissMode = .interactive
webView.translatesAutoresizingMaskIntoConstraints = false webView.translatesAutoresizingMaskIntoConstraints = false
view.addSubview(webView) view.addSubview(webView)
NSLayoutConstraint.activate([ NSLayoutConstraint.activate([