Set tab colors in MMTabline, not MMVimView

Author: sfsam

src/MacVim/MMTabline/MMTabline.h

@@ -31,6 +31,7 @@
 - (void)selectTabAtIndex:(NSUInteger)index;
 - (MMTab *)tabAtIndex:(NSUInteger)index;
 - (void)scrollTabToVisibleAtIndex:(NSUInteger)index;
+- (void)setTablineSelBackground:(NSColor *)back foreground:(NSColor *)fore;
 
 @end
 

src/MacVim/MMTabline/MMTabline.m

@@ -251,6 +251,39 @@ - (MMTab *)tabAtIndex:(NSUInteger)index
     return _tabs[index];
 }
 
+- (void)setTablineSelBackground:(NSColor *)back foreground:(NSColor *)fore
+{
+    // Reset to default tabline colors if user doesn't want auto-generated ones.
+    if ([NSUserDefaults.standardUserDefaults boolForKey:@"MMDefaultTablineColors"]) {
+        self.tablineBgColor = nil;
+        self.tablineFgColor = nil;
+        self.tablineSelBgColor = nil;
+        self.tablineSelFgColor = nil;
+        self.tablineFillFgColor = nil;
+        return;
+    }
+
+    self.tablineSelBgColor = back;
+    self.tablineSelFgColor = fore;
+
+    // Set the colors for the tabline based on the default background and
+    // foreground colors. We get the brightness component of back and fore
+    // and then adjust up or down depending on whether the color is more
+    // or less than 50% bright.
+    CGFloat h, s, b, b2, b3, b4, a;
+    
+    [back getHue:&h saturation:&s brightness:&b alpha:&a];
+    b3 = (b > 0.5) ? b - 0.25 : b + 0.35;
+    self.tablineFillFgColor = [NSColor colorWithHue:h saturation:s brightness:b3 alpha:a];
+
+    b2 = (b3 + b) / 2.;
+    self.tablineBgColor = [NSColor colorWithHue:h saturation:s brightness:b2 alpha:a];
+
+    [fore getHue:&h saturation:&s brightness:&b alpha:&a];
+    b4 = (b2 > 0.5) ? b2 - 0.25 : b2 + 0.25;
+    self.tablineFgColor = [NSColor colorWithHue:h saturation:s brightness:b4 alpha:a];
+}
+
 #pragma mark - Helpers
 
 NSComparisonResult SortTabsForZOrder(MMTab *tab1, MMTab *tab2, void *draggedTab)

src/MacVim/MMVimView.m

@@ -454,44 +454,11 @@ - (void)finishPlaceScrollbars
     }
 }
 
-- (void)setTablineColorsBasedOnBackground:(NSColor *)back foreground:(NSColor *)fore
-{
-    // Reset to default tabline colors if user doesn't want auto-generated ones.
-    if ([NSUserDefaults.standardUserDefaults boolForKey:@"MMDefaultTablineColors"]) {
-        tabline.tablineBgColor = nil;
-        tabline.tablineFgColor = nil;
-        tabline.tablineSelBgColor = nil;
-        tabline.tablineSelFgColor = nil;
-        tabline.tablineFillFgColor = nil;
-        return;
-    }
-
-    tabline.tablineSelBgColor = back;
-    tabline.tablineSelFgColor = fore;
-
-    // This is a naïve way of setting colors for the tabline based on the
-    // default background and foreground colors. We get the brightness
-    // component of back and fore and then adjust up or down depending on
-    // whether the color is more or less than 50% bright.
-    CGFloat h, s, b, b2, b3, b4, a;
-    
-    [back getHue:&h saturation:&s brightness:&b alpha:&a];
-    b2 = (b > 0.5) ? b - 0.15 : b + 0.15;
-    tabline.tablineBgColor = [NSColor colorWithHue:h saturation:s brightness:b2 alpha:a];
-    
-    b3 = (b > 0.5) ? b - 0.30 : b + 0.30;
-    tabline.tablineFillFgColor = [NSColor colorWithHue:h saturation:s brightness:b3 alpha:a];
-
-    [fore getHue:&h saturation:&s brightness:&b alpha:&a];
-    b4 = (b2 > 0.5) ? b2 - 0.25 : b2 + 0.25;
-    tabline.tablineFgColor = [NSColor colorWithHue:h saturation:s brightness:b4 alpha:a];
-}
-
 - (void)setDefaultColorsBackground:(NSColor *)back foreground:(NSColor *)fore
 {
     [textView setDefaultColorsBackground:back foreground:fore];
 
-    [self setTablineColorsBasedOnBackground:back foreground:fore];
+    [tabline setTablineSelBackground:back foreground:fore];
 
     CALayer *backedLayer = [self layer];
     if (backedLayer) {