From 7d8b5890c173e1d0878636a2ee5de8b70bdd3302 Mon Sep 17 00:00:00 2001
From: Yee Cheng Chin <ychin.git@gmail.com>
Date: Tue, 4 Dec 2018 04:14:06 -0800
Subject: [PATCH] Fix Mojave-style tabs not triggering in fullscreen

---
 src/MacVim/MMFullScreenWindow.m | 2 +-
 src/MacVim/MMWindowController.m | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/MacVim/MMFullScreenWindow.m b/src/MacVim/MMFullScreenWindow.m
index 666c14391c..2616414e08 100644
--- a/src/MacVim/MMFullScreenWindow.m
+++ b/src/MacVim/MMFullScreenWindow.m
@@ -165,7 +165,7 @@ enum {
     oldTabBarStyle = [[view tabBarControl] styleName];
 
     NSString *style =
-        shouldUseYosemiteTabBarStyle() ? @"Yosemite" : @"Unified";
+        shouldUseYosemiteTabBarStyle() ? (shouldUseMojaveTabBarStyle() ? @"Mojave" : @"Yosemite") : @"Unified";
     [[view tabBarControl] setStyleNamed:style];
 
     // add text view
diff --git a/src/MacVim/MMWindowController.m b/src/MacVim/MMWindowController.m
index d8578aefc5..ffeef33801 100644
--- a/src/MacVim/MMWindowController.m
+++ b/src/MacVim/MMWindowController.m
@@ -1751,12 +1751,12 @@
 
 + (NSString *)tabBarStyleForUnified
 {
-    return shouldUseYosemiteTabBarStyle() ? @"Yosemite" : @"Unified";
+    return shouldUseYosemiteTabBarStyle() ? (shouldUseMojaveTabBarStyle() ? @"Mojave" : @"Yosemite") : @"Unified";
 }
 
 + (NSString *)tabBarStyleForMetal
 {
-    return shouldUseYosemiteTabBarStyle() ? @"Yosemite" : @"Metal";
+    return shouldUseYosemiteTabBarStyle() ? (shouldUseMojaveTabBarStyle() ? @"Mojave" : @"Yosemite") : @"Metal";
 }
 
 @end // MMWindowController (Private)