Better selection

qinshulei · Apr 7, 2020 · 3ae5ed8 · 3ae5ed8
1 parent d11fb78
commit 3ae5ed8
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 38 deletions.
diff --git a/Blink/KBTracker.swift b/Blink/KBTracker.swift
@@ -241,5 +241,6 @@ class KBTracker {
 
   @objc private func _keyboardDidShow(_ notification: Notification) {
     debugPrint("_keyboardDidShow")
+//    kbTraits.isPortrait = 
   }
 }
diff --git a/Blink/SmarterKeys/KBProxy.swift b/Blink/SmarterKeys/KBProxy.swift
@@ -91,12 +91,13 @@ class KBProxy: UIView {
       bKBframe.size.width -= (bKBframe.size.width - rightBottom.x) - 6
       hardwareKBAttached = true
     }
-    var traits = _kbView.traits
+//    var traits = _kbView.traits
 
 //    traits.isHKBAttached = hardwareKBAttached
-    traits.isPortrait = win.bounds.width < win.bounds.height
+//    traits.isPortrait = win.bounds.width < win.bounds.height
+//    debugPrint("KBProxy isPortatit", traits.isPortrait)
 
-    _kbView.traits = traits
+//    _kbView.traits = traits
     _kbView.safeBarWidth = barButtonView.frame.width
     _kbView.frame = bKBframe
   }

diff --git a/Blink/SmarterKeys/KBView.swift b/Blink/SmarterKeys/KBView.swift
@@ -153,6 +153,7 @@ class KBView: UIView {
 
     let strictSpace = !traits.isHKBAttached && traits.hasSuggestions
     self.kbSizes = kbDevice.sizesFor(portrait: traits.isPortrait)
+    debugPrint("isPortrait", traits.isPortrait)
 
     let top: CGFloat = 0;
 

diff --git a/Blink/SmarterKeys/SmarterTermInput.swift b/Blink/SmarterKeys/SmarterTermInput.swift
@@ -105,6 +105,10 @@ class SmarterTermInput: KBWebView {
 
     if traitCollection.userInterfaceIdiom == .phone {
       kbView.traits.isPortrait = scene.interfaceOrientation.isPortrait
+    } else if kbView.traits.isFloatingKB {
+      kbView.traits.isPortrait = true
+    } else {
+      kbView.traits.isPortrait = scene.interfaceOrientation.isPortrait
     }
   }
 
@@ -114,25 +118,25 @@ class SmarterTermInput: KBWebView {
     super.ready()
     reportLang()
 
-    device?.focus()
+//    device?.focus()
     kbView.isHidden = false
     kbView.invalidateIntrinsicContentSize()
-    _refreshInputViews()
+//    _refreshInputViews()
 
     if let v = selectionView() {
       _caretHider = CaretHider(view: v)
     }
   }
 
 
-  // overriding chain
-  override var next: UIResponder? {
-    guard let responder = device?.delegate?.viewController()
-    else {
-      return super.next
-    }
-    return responder
-  }
+//  // overriding chain
+//  override var next: UIResponder? {
+//    guard let responder = device?.view?.superview
+//    else {
+//      return super.next
+//    }
+//    return responder
+//  }
 
   func reset() {
 
@@ -166,6 +170,8 @@ class SmarterTermInput: KBWebView {
 
     device?.focus()
     kbView.isHidden = false
+    setNeedsLayout()
+
     _inputAccessoryView?.isHidden = false
 
     spaceController?.cleanupControllers()
@@ -231,7 +237,7 @@ class SmarterTermInput: KBWebView {
   }
 
   override var inputAccessoryView: UIView? {
-    return _inputAccessoryView
+    _inputAccessoryView
   }
 
   func sync(traits: KBTraits, device: KBDevice, hideSmartKeysWithHKB: Bool) {

diff --git a/Blink/SpaceController.swift b/Blink/SpaceController.swift
@@ -124,25 +124,20 @@ class SpaceController: UIViewController {
       term.delegate = self
       _termControllers.insert(term)
       term.bgColor = view.backgroundColor ?? .black
-      _viewportsController.setViewControllers([term], direction: .forward, animated: false) { (didComplete) in
-        if KBTracker.shared.input?.device == nil {
-          DispatchQueue.main.async {
-            self._attachInputToCurrentTerm()
-          }
-        }
-      }
+      _viewportsController.setViewControllers([term], direction: .forward, animated: false)
     }
   }
 
 
-//  public override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
-//    super.viewWillTransition(to: size, with: coordinator)
-//    if view.window?.isKeyWindow == true {
-//      DispatchQueue.main.async {
+  public override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
+    super.viewWillTransition(to: size, with: coordinator)
+    if view.window?.isKeyWindow == true {
+      DispatchQueue.main.async {
+//        self.currentTerm()?.termDevice.view?.webView?.kbView.reset()
 //        SmarterTermInput.shared.contentView()?.reloadInputViews()
-//      }
-//    }
-//  }
+      }
+    }
+  }
 
   deinit {
     NotificationCenter.default.removeObserver(self)
@@ -202,14 +197,12 @@ class SpaceController: UIViewController {
 
     SessionRegistry.shared.track(session: term)
 
-    self._currentKey = term.meta.key
+    _currentKey = term.meta.key
     _viewportsController.setViewControllers([term], direction: .forward, animated: animated) { (didComplete) in
       DispatchQueue.main.async {
         self._displayHUD()
         self._attachInputToCurrentTerm()
-        if let completion = completion {
-          completion(didComplete)
-        }
+        completion?(didComplete)
       }
     }
   }
@@ -532,6 +525,10 @@ extension SpaceController {
     _focusOnShell()
   }
 
+  @objc public func scaleWithPich(_ pinch: UIPinchGestureRecognizer) {
+    currentTerm()?.scaleWithPich(pinch)
+  }
+
   @objc func newShellAction() {
     _createShell(userActivity: nil, animated: true)
   }

diff --git a/Blink/TermDevice.m b/Blink/TermDevice.m
@@ -358,12 +358,6 @@ - (void)attachInput:(UIView<TermInput> *)termInput
 - (void)focus {
   [_view focus];
   [_delegate deviceFocused];
-//  dispatch_async(dispatch_get_main_queue(), ^{
-//    if (![_input isFirstResponder]) {
-//      [_input becomeFirstResponder];
-//    }
-//  });
-
 }
 
 - (void)blur {