Code cleanup

Blink/ControlPanel.m

@@ -35,7 +35,7 @@ - (instancetype)initWithFrame:(CGRect)frame
     _stackView.axis = UILayoutConstraintAxisHorizontal;
     _stackView.alignment = UIStackViewAlignmentCenter;
     _stackView.distribution = UIStackViewDistributionEqualSpacing;
-    _stackView.spacing = 14;
+    _stackView.spacing = 12;
 
     _clipboardToolbar = [[RoundedToolbar alloc] initWithFrame:CGRectZero];
 

Blink/SpaceController.m

@@ -94,10 +94,11 @@ - (void)loadView
   [_viewportsController didMoveToParentViewController:self];
 
   _touchOverlay = [[TouchOverlay alloc] initWithFrame:self.view.bounds];
-  [_touchOverlay attachPageViewController:_viewportsController];
+
   [self.view addSubview:_touchOverlay];
   _touchOverlay.touchDelegate = self;
   _touchOverlay.controlPanel.controlPanelDelegate = self;
+  [_touchOverlay attachPageViewController:_viewportsController];
 
 
   [self registerForNotifications];
@@ -250,25 +251,6 @@ -(void)_appWillResignActive
 
 
 #pragma mark Events
-//- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldBeRequiredToFailByGestureRecognizer:(nonnull UIGestureRecognizer *)otherGestureRecognizer
-//{
-//  if (gestureRecognizer == _twoFingersTap && otherGestureRecognizer == _twoFingersDrag) {
-//    return YES;
-//  }
-//  if (gestureRecognizer == _twoFingersTap && [otherGestureRecognizer isKindOfClass:[UITapGestureRecognizer class]]) {
-//    return YES;
-//  }
-//  return NO;
-//}
-//
-//- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
-//{
-//  if (gestureRecognizer == _twoFingersDrag && ![otherGestureRecognizer isKindOfClass:[UIPinchGestureRecognizer class]]) {
-//    return YES;
-//  }
-//
-//  return NO;
-//}
 
 // The Space will be responsible to accommodate the work environment for widgets, adjusting the size, making sure it doesn't overlap content,
 // moving widgets or scrolling to them when necessary, etc...
@@ -311,30 +293,6 @@ - (void)_keyboardWillChangeFrame:(NSNotification *)sender
   }
 }
 
-- (void)_handleTwoFingersTap:(UITapGestureRecognizer *)sender
-{
-  if (sender.state == UIGestureRecognizerStateRecognized) {
-    [self _createShellWithUserActivity: nil sessionStateKey: nil animated:YES completion:nil];
-  }
-}
-
-- (CGAffineTransform)_transformForTranslation:(CGPoint)translation {
-
-  CGFloat scale = 0.5;//MAX(MIN(1 - (-translation.y * 3/ height), 0.5), 0.3);
-
-  CGAffineTransform move = CGAffineTransformMakeScale(scale, scale);
-  return CGAffineTransformTranslate(move, translation.x, translation.y);
-}
-
-//- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
-//{
-//  if (gestureRecognizer == _twoFingersDrag) {
-//    return [_twoFingersDrag translationInView:self.view].y < 0;
-//  }
-//  
-//  return YES;
-//}
-
 - (UIViewController *)pageViewController:(UIPageViewController *)pageViewController
        viewControllerAfterViewController:(UIViewController *)viewController
 {
@@ -888,13 +846,9 @@ - (void)touchOverlay:(TouchOverlay *)overlay onTwoFingerTap:(UITapGestureRecogni
 
 - (void)touchOverlay:(TouchOverlay *)overlay onPinch:(UIPinchGestureRecognizer *)recognizer
 {
-  [self.currentTerm.termView scaleWith:recognizer];
+  [self.currentTerm scaleWithPich:recognizer];
 }
 
-- (void)touchOverlay:(TouchOverlay *)overlay onScrollY:(CGFloat) y
-{
-//  self.view.transform = CGAffineTransformTranslate(CGAffineTransformIdentity, 0, MIN(-y, 0));
-}
 
 -(void)controlPanelOnPaste
 {

Blink/TermController.h

@@ -68,6 +68,7 @@
 - (void)focus;
 - (void)blur;
 - (void)reload;
+- (void)scaleWithPich:(UIPinchGestureRecognizer *)pinch;
 
 - (void)attachInput:(TermInput *)termInput;
 

Blink/TermController.m

@@ -49,6 +49,7 @@ @implementation TermController {
   MCPSession *_session;
   NSDictionary *_activityUserInfo;
   BOOL _isReloading;
+  NSInteger _fontSizeBeforeScaling;
 }
 
 - (void)loadView
@@ -309,6 +310,24 @@ - (void)attachInput:(TermInput *)termInput
   }
 }
 
+- (void)scaleWithPich:(UIPinchGestureRecognizer *)pinch
+{
+  switch (pinch.state) {
+    case UIGestureRecognizerStateBegan:
+    case UIGestureRecognizerStateEnded:
+      _fontSizeBeforeScaling = _sessionParameters.fontSize;
+      break;
+    case UIGestureRecognizerStateChanged: {
+      NSInteger newSize = (NSInteger)round(_fontSizeBeforeScaling * pinch.scale);
+      if (newSize != _sessionParameters.fontSize) {
+        [_termView setFontSize:@(newSize)];
+      }
+    }
+    default:
+      break;
+  }
+}
+
 
 
 @end

Blink/TermView.h

@@ -77,14 +77,12 @@
 - (void)reset;
 
 - (void)blur;
-- (void)focus;
+- (void)focus; 
 - (void)cleanSelection;
 - (void)increaseFontSize;
 - (void)decreaseFontSize;
 - (void)resetFontSize;
 
-- (void)scaleWith:(UIPinchGestureRecognizer *)recognizer;
-
 - (void)modifySideOfSelection;
 - (void)modifySelectionInDirection:(NSString *)direction granularity:(NSString *)granularity;
 @end

Blink/TermView.m

@@ -80,11 +80,7 @@ @interface TermView () <UIGestureRecognizerDelegate, WKScriptMessageHandler>
 
 @implementation TermView {
   WKWebView *_webView;
-
-  UITapGestureRecognizer *_tapGesture;
-  UIPinchGestureRecognizer *_pinchGesture;
 
-  NSTimer *_pinchSamplingTimer;
   BOOL _focused;
 
   BOOL _jsIsBusy;
@@ -112,14 +108,6 @@ - (id)initWithFrame:(CGRect)frame
 - (void)didMoveToWindow
 {
   [super didMoveToWindow];
-
-  if (self.window.screen == [UIScreen mainScreen]) {
-    [self _addGestures];
-  }
-}
-
-- (BOOL)isDragging {
-  return _webView.scrollView.panGestureRecognizer.state == UIGestureRecognizerStateRecognized;
 }
 
 - (BOOL)canBecomeFirstResponder {
@@ -135,6 +123,7 @@ - (void)_addWebView
   _webView = [[BKWebView alloc] initWithFrame:self.bounds configuration:configuration];
 
   _webView.scrollView.delaysContentTouches = NO;
+  _webView.scrollView.canCancelContentTouches = NO;
   _webView.scrollView.scrollEnabled = NO;
   _webView.scrollView.panGestureRecognizer.enabled = NO;
 
@@ -146,27 +135,6 @@ - (void)_addWebView
   [self addSubview:_webView];
 }
 
-
-- (void)_addGestures
-{
-
-  if (!_tapGesture) {
-    _tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_activeControl:)];
-    [_tapGesture setNumberOfTapsRequired:1];
-    _tapGesture.delegate = self;
-    [_webView addGestureRecognizer:_tapGesture];
-  }
-
-
-  if (!_pinchGesture) {
-//    _pinchGesture = [[UIPinchGestureRecognizer alloc] initWithTarget:self action:@selector(_handlePinch:)];
-//    _pinchGesture.delegate = self;
-//    [_webView addGestureRecognizer:_pinchGesture];
-//  
-//    [_pinchGesture requireGestureRecognizerToFail: _tapGesture];
-  }
-}
-
 - (NSString *)title
 {
   return _webView.title;
@@ -315,7 +283,7 @@ - (void)userContentController:(WKUserContentController *)userContentController
 - (void)_handleSelectionChange:(NSDictionary *)data
 {
   _selectedText = data[@"text"];
-  _hasSelection =  _selectedText.length > 0;
+  _hasSelection = _selectedText.length > 0;
 
   if (!_hasSelection) {
     return;
@@ -345,36 +313,12 @@ - (void)modifySideOfSelection
 {
   [_webView evaluateJavaScript:term_modifySideSelection() completionHandler:nil];
 }
+
 - (void)modifySelectionInDirection:(NSString *)direction granularity:(NSString *)granularity
 {
   [_webView evaluateJavaScript:term_modifySelection(direction, granularity) completionHandler:nil];
 }
 
-- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
-{
-  if (gestureRecognizer == _tapGesture) {
-    return YES;
-  }
-
-  return YES;
-}
-
-- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldBeRequiredToFailByGestureRecognizer:(nonnull UIGestureRecognizer *)otherGestureRecognizer
-{
-  if (gestureRecognizer == _pinchGesture && [otherGestureRecognizer isKindOfClass:[UISwipeGestureRecognizer class]]) {
-    return YES;
-  }
-  return NO;
-}
-
-- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
-{
-  if (gestureRecognizer == _tapGesture) {
-    return !_hasSelection;
-  }
-  return YES;
-}
-
 - (NSURL *)_detectLinkInSelection:(NSDictionary *)data
 {
   __block NSURL *result = nil;
@@ -417,50 +361,6 @@ - (void)yank:(id)sender
 {
 }
 
-- (void)_activeControl:(UITapGestureRecognizer *)gestureRecognizer
-{
-    if (gestureRecognizer.state != UIGestureRecognizerStateRecognized) {
-        return;
-    }
-
-    [_termDelegate focus];
-}
-
-- (void)_handlePinch:(UIPinchGestureRecognizer *)gestureRecognizer
-{
-  switch (gestureRecognizer.state) {
-    case UIGestureRecognizerStateBegan:
-      [_pinchSamplingTimer invalidate];
-      _pinchSamplingTimer = [NSTimer scheduledTimerWithTimeInterval:0.2
-                                                             target:self
-                                                           selector:@selector(_pinchSampling:)
-                                                           userInfo:nil repeats:YES];
-      break;
-    case UIGestureRecognizerStateEnded:
-    case UIGestureRecognizerStateCancelled:
-      [_pinchSamplingTimer invalidate];
-      break;
-    default:
-      break;
-  }
-}
-
-- (void)_pinchSampling:(NSTimer *)timer
-{
-  [_webView evaluateJavaScript: term_scale(_pinchGesture.scale)
-             completionHandler:^(id _Nullable res, NSError * _Nullable error) {
-    _pinchGesture.scale = 1;
-  }];
-}
-
-- (void)scaleWith:(UIPinchGestureRecognizer *)recognizer
-{
-  [_webView evaluateJavaScript: term_scale(recognizer.scale)
-             completionHandler:^(id _Nullable res, NSError * _Nullable error) {
-               recognizer.scale = 1;
-             }];
-}
-
 - (void)copy:(id)sender
 {
   [_webView copy:sender];

Blink/TouchOverlay.h

@@ -16,7 +16,6 @@
 - (void)touchOverlay:(TouchOverlay *)overlay onOneFingerTap:(UITapGestureRecognizer *)recognizer;
 - (void)touchOverlay:(TouchOverlay *)overlay onTwoFingerTap:(UITapGestureRecognizer *)recognizer;
 - (void)touchOverlay:(TouchOverlay *)overlay onPinch:(UIPinchGestureRecognizer *)recognizer;
-- (void)touchOverlay:(TouchOverlay *)overlay onScrollY:(CGFloat) y;
 
 @end