macosx: fix key capture for hotkeys when setting new ones.

diff --git a/modules/gui/macosx/simple_prefs.h b/modules/gui/macosx/simple_prefs.h
index d02ebaeb219a86688abb0e2cd0ea6c8c8672e31d..b37adcb2a399decac415d54110c42f24d2178c07 100644 (file)
--- a/modules/gui/macosx/simple_prefs.h
+++ b/modules/gui/macosx/simple_prefs.h
@@ -205,12 +205,10 @@
 - (void)showHotkeySettings;
 - (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView;
 - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex;
-- (void)changeHotkeyTo: (int)i_theNewKey;
+- (BOOL)changeHotkeyTo: (int)i_theNewKey;
 
 @end
 
 @interface VLCHotkeyChangeWindow : NSWindow
 
-- (void)keyDown:(NSEvent *)theEvent;
-
 @end

diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index edb5a205bfc28dad903e1e5bf1769e05f2642ff3..4b2f2ab319d90e78e9763acc0b82f335d9555c30 100644 (file)
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -1187,7 +1187,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
     }
 }
 
-- (void)changeHotkeyTo: (int)i_theNewKey
+- (BOOL)changeHotkeyTo: (int)i_theNewKey
 {
     int i_returnValue;
     i_returnValue = [o_hotkeysNonUseableKeys indexOfObject: [NSNumber numberWithInt: i_theNewKey]];
@@ -1196,6 +1196,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
         [o_hotkeys_change_keys_lbl setStringValue: _NS("Invalid combination")];
         [o_hotkeys_change_taken_lbl setStringValue: _NS("Regrettably, these keys cannot be assigned as hotkey shortcuts.")];
         [o_hotkeys_change_ok_btn setEnabled: NO];
+        return NO;
     }
     else
     {
@@ -1217,6 +1218,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
             [o_hotkeys_change_taken_lbl setStringValue: @""];
 
         [o_hotkeys_change_ok_btn setEnabled: YES];
+        return YES;
     }
 }
     
@@ -1228,13 +1230,23 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
 
 @implementation VLCHotkeyChangeWindow
 
+- (BOOL)acceptsFirstResponder
+{
+    return YES;
+}
+
+- (BOOL)becomeFirstResponder
+{
+    return YES;
+}
+
 - (BOOL)resignFirstResponder
 {
     /* We need to stay the first responder or we'll miss the user's input */
     return NO;
 }
 
-- (void)keyDown:(NSEvent *)o_theEvent
+- (BOOL)performKeyEquivalent:(NSEvent *)o_theEvent
 {
     unichar key;
     int i_key = 0;
@@ -1255,8 +1267,9 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
     if( key )
     {
         i_key |= CocoaKeyToVLC( key );
-        [[[VLCMain sharedInstance] getSimplePreferences] changeHotkeyTo: i_key];
+        return [[[VLCMain sharedInstance] getSimplePreferences] changeHotkeyTo: i_key];
     }
+    return FALSE;
 }
 
 @end