Cleanup on new tabs code and make them compatible on old macOS versions

Author: ychin

runtime/doc/gui_mac.txt

@@ -313,6 +313,7 @@ KEY				VALUE ~
 *MMShowTabScrollButtons*	enable tab scroll buttons on tabline [bool]
 *MMTabMinWidth*			minimum width of a tab [int]
 *MMTabOptimumWidth*		default width of a tab [int]
+*MMDefaultTablineColors*	use default colors instead of colorscheme for tabs [bool]
 *MMTextInsetBottom*		text area offset in pixels [int]
 *MMTextInsetLeft*		text area offset in pixels [int]
 *MMTextInsetRight*		text area offset in pixels [int]

runtime/doc/tags

@@ -5634,6 +5634,7 @@ MMAllowForceClickLookUp	gui_mac.txt	/*MMAllowForceClickLookUp*
 MMAppearanceModeSelection	gui_mac.txt	/*MMAppearanceModeSelection*
 MMCellWidthMultiplier	gui_mac.txt	/*MMCellWidthMultiplier*
 MMCmdLineAlignBottom	gui_mac.txt	/*MMCmdLineAlignBottom*
+MMDefaultTablineColors	gui_mac.txt	/*MMDefaultTablineColors*
 MMDialogsTrackPwd	gui_mac.txt	/*MMDialogsTrackPwd*
 MMDisableLaunchAnimation	gui_mac.txt	/*MMDisableLaunchAnimation*
 MMFontPreserveLineSpacing	gui_mac.txt	/*MMFontPreserveLineSpacing*

src/MacVim/MMTabline/MMTab.m

@@ -3,6 +3,12 @@
 #import "MMTabline.h"
 #import "MMHoverButton.h"
 
+#import "MacVim.h" // for availability macros
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_13
+typedef NSString * NSAnimatablePropertyKey;
+#endif
+
 @interface MMTab ()
 @property (nonatomic) NSColor *fillColor;
 @end
@@ -38,8 +44,14 @@ - (instancetype)initWithFrame:(NSRect)frameRect tabline:(MMTabline *)tabline
         [self addSubview:_closeButton];
 
         _titleLabel = [NSTextField new];
-        _titleLabel.stringValue = @"[No Name]";
-        _titleLabel.font = [NSFont systemFontOfSize:11 weight:NSFontWeightSemibold];
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_11
+        if (AVAILABLE_MAC_OS(10,11)) {
+            _titleLabel.font = [NSFont systemFontOfSize:NSFont.smallSystemFontSize weight:NSFontWeightSemibold];
+        } else
+#endif
+        {
+            _titleLabel.font = [NSFont systemFontOfSize:NSFont.smallSystemFontSize];
+        }
         _titleLabel.textColor = NSColor.controlTextColor;
         _titleLabel.editable = NO;
         _titleLabel.selectable = NO;
@@ -122,12 +134,8 @@ - (void)setState:(MMTabState)state
 }
 
 - (NSColor *)unselectedHoverColor
-{   // stackoverflow.com/a/52516863/111418
-    NSAppearance *currentAppearance = NSAppearance.currentAppearance;
-    NSAppearance.currentAppearance = self.effectiveAppearance;
-    NSColor *c = [_tabline.tablineSelBgColor blendedColorWithFraction:0.6 ofColor:_tabline.tablineBgColor];
-    NSAppearance.currentAppearance = currentAppearance;
-    return c;
+{
+    return [_tabline.tablineSelBgColor blendedColorWithFraction:0.6 ofColor:_tabline.tablineBgColor];
 }
 
 - (void)drawRect:(NSRect)dirtyRect
@@ -148,7 +156,7 @@ - (void)drawRect:(NSRect)dirtyRect
     // line between the top of the tab and the window's title bar.
     // It looks better given the new way macOS 11 draws title bars.
     // Older macOS versions don't need this.
-    if (@available(macOS 11.0, *)) {
+    if (AVAILABLE_MAC_OS(11,0)) {
         NSAffineTransform *transform = [NSAffineTransform new];
         [transform translateXBy:0 yBy:-1.0];
         [p transformUsingAffineTransform:transform];

src/MacVim/MMTabline/MMTabline.m

@@ -12,7 +12,7 @@
 const CGFloat MinimumTabWidth = 100;
 const CGFloat TabOverlap      = 6;
 
-MMHoverButton* MakeHoverButton(MMTabline *tabline, NSString *imageName, NSString *tooltip, SEL action, BOOL continuous) {
+static MMHoverButton* MakeHoverButton(MMTabline *tabline, NSString *imageName, NSString *tooltip, SEL action, BOOL continuous) {
     MMHoverButton *button = [MMHoverButton new];
     button.image = [MMHoverButton imageNamed:imageName];
     button.translatesAutoresizingMaskIntoConstraints = NO;
@@ -25,6 +25,11 @@
     return button;
 }
 
+static BOOL isDarkMode(NSAppearance *appearance) {
+    int flags = getCurrentAppearance(appearance);
+    return (flags == 1 || flags == 3);
+}
+
 @implementation MMTabline
 {
     NSView *_tabsContainer;
@@ -185,7 +190,7 @@ - (void)setShowsTabScrollButtons:(BOOL)showsTabScrollButtons
 
 - (NSColor *)tablineBgColor
 {
-    return _tablineBgColor ?: getCurrentAppearance(self.effectiveAppearance)
+    return _tablineBgColor ?: isDarkMode(self.effectiveAppearance)
         ? [NSColor colorWithWhite:0.2 alpha:1]
         : [NSColor colorWithWhite:0.8 alpha:1];
 }
@@ -209,7 +214,7 @@ - (void)setTablineFgColor:(NSColor *)color
 
 - (NSColor *)tablineSelBgColor
 {
-    return _tablineSelBgColor ?: getCurrentAppearance(self.effectiveAppearance)
+    return _tablineSelBgColor ?: isDarkMode(self.effectiveAppearance)
         ? [NSColor colorWithWhite:0.4 alpha:1]
         : NSColor.whiteColor;
 }
@@ -236,7 +241,7 @@ - (void)setTablineSelFgColor:(NSColor *)color
 
 - (NSColor *)tablineFillFgColor
 {
-    return _tablineFillFgColor ?: getCurrentAppearance(self.effectiveAppearance)
+    return _tablineFillFgColor ?: isDarkMode(self.effectiveAppearance)
         ? [NSColor colorWithWhite:0.2 alpha:1]
         : [NSColor colorWithWhite:0.8 alpha:1];
 }
@@ -427,7 +432,7 @@ - (void)fixupTabZOrder
 - (void)fixupLayoutWithAnimation:(BOOL)shouldAnimate
 {
     if (_tabs.count == 0) return;
-    
+
     TabWidth t = [self tabWidthForTabs:_tabs.count];
     for (NSInteger i = 0; i < _tabs.count; i++) {
         MMTab *tab = _tabs[i];
@@ -440,8 +445,10 @@ - (void)fixupLayoutWithAnimation:(BOOL)shouldAnimate
                 context.allowsImplicitAnimation = YES;
                 tab.animator.frame = frame;
                 [tab layout];
-            }];
-        } else tab.frame = frame;
+            } completionHandler:nil];
+        } else {
+            tab.frame = frame;
+        }
     }
     // _tabsContainer expands to fit tabs, is at least as wide as _scrollView.
     NSRect frame = _tabsContainer.frame;
@@ -597,19 +604,25 @@ - (void)updateTabScrollButtonsEnabledState
 - (void)scrollTabToVisibleAtIndex:(NSInteger)index
 {
     if (_tabs.count == 0) return;
-    
+
     // Get the amount of time elapsed between the previous invocation
     // of this method and now. Use this elapsed time to set the animation
     // duration such that rapid invocations of this method result in
     // faster animations. For example, the user might hold down the tab
     // scrolling buttons (causing them to repeatedly fire) or they might
     // rapidly click them.
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12
     static NSTimeInterval lastTime = 0;
     struct timespec t;
     clock_gettime(CLOCK_MONOTONIC, &t);
     NSTimeInterval currentTime = t.tv_sec + t.tv_nsec * 1.e-9;
     NSTimeInterval elapsedTime = currentTime - lastTime;
     lastTime = currentTime;
+#else
+    // clock_gettime was only added to macOS 10.12. Just use a fixed value. No
+    // need to find an alternative API for legacy macOS versions.
+    NSTimeInterval elapsedTime = 0.1;
+#endif
 
     NSRect tabFrame = _tabs[index].frame;
     NSRect clipBounds = _scrollView.contentView.bounds;

src/MacVim/MMWindow.m

@@ -79,7 +79,6 @@ - (id)initWithContentRect:(NSRect)rect
     tablineSeparator = [[NSBox alloc] initWithFrame:tabSepRect];
 
     [tablineSeparator setBoxType:NSBoxSeparator];
-    [tablineSeparator setFillColor:NSColor.secondaryLabelColor];
     [tablineSeparator setHidden:YES];
     [tablineSeparator setAutoresizingMask:NSViewWidthSizable|NSViewMinYMargin];