Do not autofocus on appearence menu

chr1s-hub · Apr 11, 2020 · d4d08df · d4d08df
1 parent d337362
commit d4d08df
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/Blink/SmarterKeys/SmarterTermInput.swift b/Blink/SmarterKeys/SmarterTermInput.swift
@@ -68,7 +68,7 @@ class SmarterTermInput: KBWebView {
   override init(frame: CGRect, configuration: WKWebViewConfiguration) {
 
     super.init(frame: frame, configuration: configuration)
-    
+
 //    self.allowDisplayingKeyboardWithoutUserAction()
     kbView.keyInput = self
     kbView.lang = textInputMode?.primaryLanguage ?? ""

diff --git a/Blink/TermView.m b/Blink/TermView.m
@@ -146,6 +146,11 @@ - (BOOL)canBecomeFirstResponder {
   return NO;
 }
 
+- (void)setUserInteractionEnabled:(BOOL)userInteractionEnabled {
+  [super setUserInteractionEnabled:userInteractionEnabled];
+  [_webView setUserInteractionEnabled:userInteractionEnabled];
+}
+
 - (void)_addWebView
 {
   WKWebViewConfiguration *configuration = [[WKWebViewConfiguration alloc] init];

diff --git a/KB/Native/Views/KBWebViewBase.m b/KB/Native/Views/KBWebViewBase.m
@@ -199,8 +199,10 @@ - (void)_imeGuardDown:(KeyCommand *)cmd {
 
 - (id)_inputDelegate { return self; }
 - (int)_webView:(WKWebView *)webView decidePolicyForFocusedElement:(id) info {
-  return _focused ? 1 : 0;
-//  return 1;
+  if (self.userInteractionEnabled) {
+    return _focused ? 1 : 0;
+  }
+  return NO;
 }
 
 - (_Bool)_webView:(WKWebView *)arg1 focusShouldStartInputSession:(id)arg2 {