From 72234fae0f9591c083d2755e625b5e286da24fe6 Mon Sep 17 00:00:00 2001
From: Josh Petrie <josh@joshpetrie.net>
Date: Wed, 8 Jun 2016 18:58:31 -0700
Subject: [PATCH] Set the default for MMFullScreenFadeTime at startup to avoid
 cumbersome checks later.

---
 src/MacVim/MMAppController.m    | 59 +++++++++++++++++----------------
 src/MacVim/MMFullScreenWindow.m | 11 ++----
 2 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/src/MacVim/MMAppController.m b/src/MacVim/MMAppController.m
index 6c346594ca..355f0cca82 100644
--- a/src/MacVim/MMAppController.m
+++ b/src/MacVim/MMAppController.m
@@ -183,39 +183,40 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
                              kCFPreferencesCurrentApplication);
     
     NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
-        [NSNumber numberWithBool:NO],   MMNoWindowKey,
-        [NSNumber numberWithInt:64],    MMTabMinWidthKey,
-        [NSNumber numberWithInt:6*64],  MMTabMaxWidthKey,
-        [NSNumber numberWithInt:132],   MMTabOptimumWidthKey,
-        [NSNumber numberWithBool:YES],  MMShowAddTabButtonKey,
-        [NSNumber numberWithInt:2],     MMTextInsetLeftKey,
-        [NSNumber numberWithInt:1],     MMTextInsetRightKey,
-        [NSNumber numberWithInt:1],     MMTextInsetTopKey,
-        [NSNumber numberWithInt:1],     MMTextInsetBottomKey,
-        @"MMTypesetter",                MMTypesetterKey,
-        [NSNumber numberWithFloat:1],   MMCellWidthMultiplierKey,
-        [NSNumber numberWithFloat:-1],  MMBaselineOffsetKey,
-        [NSNumber numberWithBool:YES],  MMTranslateCtrlClickKey,
-        [NSNumber numberWithInt:0],     MMOpenInCurrentWindowKey,
-        [NSNumber numberWithBool:NO],   MMNoFontSubstitutionKey,
-        [NSNumber numberWithBool:YES],  MMLoginShellKey,
+        [NSNumber numberWithBool:NO],     MMNoWindowKey,
+        [NSNumber numberWithInt:64],      MMTabMinWidthKey,
+        [NSNumber numberWithInt:6*64],    MMTabMaxWidthKey,
+        [NSNumber numberWithInt:132],     MMTabOptimumWidthKey,
+        [NSNumber numberWithBool:YES],    MMShowAddTabButtonKey,
+        [NSNumber numberWithInt:2],       MMTextInsetLeftKey,
+        [NSNumber numberWithInt:1],       MMTextInsetRightKey,
+        [NSNumber numberWithInt:1],       MMTextInsetTopKey,
+        [NSNumber numberWithInt:1],       MMTextInsetBottomKey,
+        @"MMTypesetter",                  MMTypesetterKey,
+        [NSNumber numberWithFloat:1],     MMCellWidthMultiplierKey,
+        [NSNumber numberWithFloat:-1],    MMBaselineOffsetKey,
+        [NSNumber numberWithBool:YES],    MMTranslateCtrlClickKey,
+        [NSNumber numberWithInt:0],       MMOpenInCurrentWindowKey,
+        [NSNumber numberWithBool:NO],     MMNoFontSubstitutionKey,
+        [NSNumber numberWithBool:YES],    MMLoginShellKey,
         [NSNumber numberWithInt:MMRendererCoreText],
-                                        MMRendererKey,
+                                          MMRendererKey,
         [NSNumber numberWithInt:MMUntitledWindowAlways],
-                                        MMUntitledWindowKey,
-        [NSNumber numberWithBool:NO],   MMZoomBothKey,
-        @"",                            MMLoginShellCommandKey,
-        @"",                            MMLoginShellArgumentKey,
-        [NSNumber numberWithBool:YES],  MMDialogsTrackPwdKey,
-        [NSNumber numberWithInt:3],     MMOpenLayoutKey,
-        [NSNumber numberWithBool:NO],   MMVerticalSplitKey,
-        [NSNumber numberWithInt:0],     MMPreloadCacheSizeKey,
-        [NSNumber numberWithInt:0],     MMLastWindowClosedBehaviorKey,
+                                          MMUntitledWindowKey,
+        [NSNumber numberWithBool:NO],     MMZoomBothKey,
+        @"",                              MMLoginShellCommandKey,
+        @"",                              MMLoginShellArgumentKey,
+        [NSNumber numberWithBool:YES],    MMDialogsTrackPwdKey,
+        [NSNumber numberWithInt:3],       MMOpenLayoutKey,
+        [NSNumber numberWithBool:NO],     MMVerticalSplitKey,
+        [NSNumber numberWithInt:0],       MMPreloadCacheSizeKey,
+        [NSNumber numberWithInt:0],       MMLastWindowClosedBehaviorKey,
 #ifdef INCLUDE_OLD_IM_CODE
-        [NSNumber numberWithBool:YES],  MMUseInlineImKey,
+        [NSNumber numberWithBool:YES],    MMUseInlineImKey,
 #endif // INCLUDE_OLD_IM_CODE
-        [NSNumber numberWithBool:NO],   MMSuppressTerminationAlertKey,
-        [NSNumber numberWithBool:YES],  MMNativeFullScreenKey,
+        [NSNumber numberWithBool:NO],     MMSuppressTerminationAlertKey,
+        [NSNumber numberWithBool:YES],    MMNativeFullScreenKey,
+        [NSNumber numberWithDouble:0.25], MMFullScreenFadeTimeKey,
         nil];
 
     [[NSUserDefaults standardUserDefaults] registerDefaults:dict];
diff --git a/src/MacVim/MMFullScreenWindow.m b/src/MacVim/MMFullScreenWindow.m
index d0af2bc681..9c3699a09e 100644
--- a/src/MacVim/MMFullScreenWindow.m
+++ b/src/MacVim/MMFullScreenWindow.m
@@ -105,15 +105,8 @@ enum {
     // NOTE: Vim needs to process mouse moved events, so enable them here.
     [self setAcceptsMouseMovedEvents:YES];
   
-    // Prefer to get the fade time from preferences, but default to the original time
-    // if the key doesn't exist yet.
-    NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults];
-    if ([[[defaults dictionaryRepresentation] allKeys] containsObject:MMFullScreenFadeTimeKey]) {
-        fadeTime = [[NSUserDefaults standardUserDefaults] doubleForKey:MMFullScreenFadeTimeKey];
-    } else {
-        fadeTime = 0.25;
-    }
-    
+    fadeTime = [[NSUserDefaults standardUserDefaults] doubleForKey:MMFullScreenFadeTimeKey];
+
     // Each fade goes in and then out, so the fade hardware must be reserved accordingly and the
     // actual fade time can't exceed half the allowable reservation time... plus some slack to
     // prevent visual artifacts caused by defaulting on the fade hardware lease.