Always close the window in focus with cmd+w (mac), closes #2511

toggl-open-source · Jul 23, 2018 · 00e4fa9 · 00e4fa9
1 parent c37b89f
commit 00e4fa9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/ui/osx/TogglDesktop/test2/AppDelegate.m b/src/ui/osx/TogglDesktop/test2/AppDelegate.m
@@ -1141,7 +1141,10 @@ - (IBAction)onPreferencesMenuItem:(id)sender
 
 - (IBAction)onHideMenuItem:(id)sender
 {
-	[self.mainWindowController.window close];
+	NSArray *orderedWindows = [NSApp orderedWindows];
+	NSWindow *frontWindow = orderedWindows[0];
+
+	[frontWindow close];
 }
 
 - (void)onQuitMenuItem

diff --git a/src/ui/osx/TogglDesktop/test2/Base.lproj/MainMenu.xib b/src/ui/osx/TogglDesktop/test2/Base.lproj/MainMenu.xib
@@ -228,7 +228,7 @@
                                 </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="8qb-je-u7S"/>
-                            <menuItem title="Hide Main Window" keyEquivalent="w" id="O2e-Kb-cHX">
+                            <menuItem title="Close Window" keyEquivalent="w" id="O2e-Kb-cHX">
                                 <connections>
                                     <action selector="onHideMenuItem:" target="494" id="dJX-ZW-bid"/>
                                 </connections>