fix: add workaround for xvim added content insets for command line ba…

…r will reset to 0 by xcode when add tab or change full screen state.
XVimProject · Mar 20, 2021 · 51cdc86 · 51cdc86
1 parent 34a74cc
commit 51cdc86
Showing 1 changed file with 26 additions and 8 deletions.
diff --git a/XVim2/Xcode/SourceEditorViewProxy.m b/XVim2/Xcode/SourceEditorViewProxy.m
@@ -667,10 +667,13 @@ - (void)showCommandLine
             insets.bottom += XvimCommandLineHeight;
             scrollView.animator.contentInsets = insets;
             [scrollView setUpdatingAutoContentInsets:YES];
-        }
-                    completionHandler:^{
-                        self.commandLine.needsDisplay = YES;
-                    }];
+        } completionHandler:^{
+            self.commandLine.needsDisplay = YES;
+            // XVim added contentInsets.bottom value for command line bar will discard by Xcode
+            // when add tab, change fullscreen state etc.
+            // This observe is for re-add it.
+            [scrollView addObserver:self forKeyPath:@"contentInsets" options:NSKeyValueObservingOptionNew context:nil];
+        }];
     }
 }
 
@@ -681,6 +684,7 @@ - (void)hideCommandLine
 
     let scrollView = [self.sourceEditorView scrollView];
     if ([self.sourceEditorView.class isEqual:NSClassFromString(IDESourceEditorViewClassName)]) {
+        [scrollView removeObserver:self forKeyPath:@"contentInsets"];
         NSEdgeInsets insets = scrollView.contentInsets;
         insets.bottom -= XvimCommandLineHeight;
 
@@ -689,11 +693,25 @@ - (void)hideCommandLine
             self->_cmdLineBottomAnchor.animator.constant = -XvimCommandLineHeight;
             scrollView.animator.contentInsets = insets;
             [scrollView setUpdatingAutoContentInsets:YES];
+        } completionHandler:^{
+            [self.commandLine removeFromSuperview];
+            self->_cmdLineBottomAnchor = nil;
+        }];
+    }
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath
+                      ofObject:(id)object
+                        change:(NSDictionary<NSKeyValueChangeKey, id> *)change
+                       context:(void *)context
+{
+    if ([keyPath isEqualToString:@"contentInsets"]) {
+        let scrollView = self.sourceEditorView.scrollView;
+        NSEdgeInsets insets = scrollView.contentInsets;
+        if (self.isShowingCommandLine && insets.bottom == 0) {
+            insets.bottom += XvimCommandLineHeight;
+            scrollView.contentInsets = insets;
         }
-                    completionHandler:^{
-                        [self.commandLine removeFromSuperview];
-                        self->_cmdLineBottomAnchor = nil;
-                    }];
     }
 }