From 2b9bc2509aa5a1e23cfba5bf7990a65dc29d7b44 Mon Sep 17 00:00:00 2001
From: rogerman <rogerman@users.noreply.github.com>
Date: Mon, 4 Sep 2017 09:54:35 -0700
Subject: [PATCH] Cocoa Port: Additional tweaks to the new turbo settings UI.
 (Related to commit af22153.)

---
 .../English.lproj/MainMenu.strings            | Bin 380996 -> 381024 bytes
 .../translations/English.lproj/MainMenu.xib   |   6 +++---
 .../cocoa/userinterface/inputPrefsView.mm     |   8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/desmume/src/frontend/cocoa/translations/English.lproj/MainMenu.strings b/desmume/src/frontend/cocoa/translations/English.lproj/MainMenu.strings
index 86f951df0e771ab67957326b47ca60e02aad2169..cceb76865a7354ddfdec9ebd7058b202fe3475f5 100644
GIT binary patch
delta 62
zcmX@IK>Wc1@rD-07N!>FEi67!(+x5h1*ZE&u|!Q@0A#V2G88c+O}{vwC3w1A9JAKs
R3)U>{2GK0r4Wd~^N&&4J6odc(

delta 58
zcmV-A0LA~{pcllT7l4ETgaU*Ev;<6Am(a%r3YTPB1X7m}Ap!;gVwYjY0V$V&Tmw{-
Q&^rW&Oj`uEOj`vMb$3P-5C8xG

diff --git a/desmume/src/frontend/cocoa/translations/English.lproj/MainMenu.xib b/desmume/src/frontend/cocoa/translations/English.lproj/MainMenu.xib
index d3d105ad1..736b5e959 100644
--- a/desmume/src/frontend/cocoa/translations/English.lproj/MainMenu.xib
+++ b/desmume/src/frontend/cocoa/translations/English.lproj/MainMenu.xib
@@ -9696,14 +9696,14 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
             <object class="NSButton" id="523260352">
               <reference key="NSNextResponder" ref="663395288"/>
               <int key="NSvFlags">268</int>
-              <string key="NSFrame">{{13, 108}, {63, 18}}</string>
+              <string key="NSFrame">{{13, 108}, {106, 18}}</string>
               <reference key="NSSuperview" ref="663395288"/>
               <string key="NSReuseIdentifierKey">_NS:682</string>
               <bool key="NSEnabled">YES</bool>
               <object class="NSButtonCell" key="NSCell" id="149222356">
                 <int key="NSCellFlags">-2080374784</int>
                 <int key="NSCellFlags2">0</int>
-                <string key="NSContents">Turbo</string>
+                <string key="NSContents">Enable Turbo</string>
                 <reference key="NSSupport" ref="462791774"/>
                 <string key="NSCellIdentifier">_NS:682</string>
                 <reference key="NSControlView" ref="523260352"/>
@@ -9962,7 +9962,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
             <object class="NSPopUpButton" id="568942126">
               <reference key="NSNextResponder" ref="663395288"/>
               <int key="NSvFlags">268</int>
-              <string key="NSFrame">{{95, 104}, {300, 26}}</string>
+              <string key="NSFrame">{{128, 104}, {300, 26}}</string>
               <reference key="NSSuperview" ref="663395288"/>
               <string key="NSReuseIdentifierKey">_NS:791</string>
               <bool key="NSEnabled">YES</bool>
diff --git a/desmume/src/frontend/cocoa/userinterface/inputPrefsView.mm b/desmume/src/frontend/cocoa/userinterface/inputPrefsView.mm
index 11a9b84a7..26f5c449f 100644
--- a/desmume/src/frontend/cocoa/userinterface/inputPrefsView.mm
+++ b/desmume/src/frontend/cocoa/userinterface/inputPrefsView.mm
@@ -864,9 +864,9 @@
 	NSRect oldSheetFrame = [theSheet frame];
 	NSRect newSheetFrame = oldSheetFrame;
 	
-	if (controlWidth < 377.0f)
+	if (controlWidth < 410.0f)
 	{
-		newSheetFrame.size.width = 407.0f;
+		newSheetFrame.size.width = 440.0f;
 	}
 	else
 	{
@@ -883,7 +883,8 @@
 
 - (IBAction) setTurboPatternBits:(id)sender
 {
-	NSNumber *turboPatternLengthNumber = (NSNumber *)[[self inputSettingsInEdit] valueForKey:@"intValue3"];
+	NSMutableDictionary *editedDeviceInfo = (NSMutableDictionary *)[inputSettingsController content];
+	NSNumber *turboPatternLengthNumber = (NSNumber *)[editedDeviceInfo valueForKey:@"intValue3"];
 	NSInteger turboPatternLength = [turboPatternLengthNumber integerValue];
 	
 	uint32_t turboPattern = 0;
@@ -898,7 +899,6 @@
 	}
 	
 	NSNumber *turboPatternNumber = [NSNumber numberWithUnsignedInt:turboPattern];
-	NSMutableDictionary *editedDeviceInfo = (NSMutableDictionary *)[inputSettingsController content];
 	[editedDeviceInfo setValue:turboPatternNumber forKey:@"intValue2"];
 }