Skip to content

V
vlc
Commit d7df1123 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: handle Lion's fullscreen shortcut in addition to our own keys (close #6313)

parent c3ea7f28
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 0 deletions
modules/gui/macosx/VideoView.m
View file @ d7df1123
...@@ -120,6 +120,9 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -120,6 +120,9 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
if( var_GetBool( p_playlist, "fullscreen") ) if( var_GetBool( p_playlist, "fullscreen") )
[[VLCCoreInteraction sharedInstance] toggleFullscreen]; [[VLCCoreInteraction sharedInstance] toggleFullscreen];
} }
/* handle Lion's default key combo for fullscreen-toggle in addition to our own hotkeys */
else if( key == 'f' && i_pressed_modifiers & NSControlKeyMask && i_pressed_modifiers & NSCommandKeyMask )
[[VLCCoreInteraction sharedInstance] toggleFullscreen];
else if ( p_vout ) else if ( p_vout )
{ {
if( key == ' ' ) if( key == ' ' )
......
modules/gui/macosx/intf.m
View file @ d7df1123
...@@ -1299,6 +1299,13 @@ unsigned int CocoaKeyToVLC( unichar i_key ) ...@@ -1299,6 +1299,13 @@ unsigned int CocoaKeyToVLC( unichar i_key )
key = [[o_event charactersIgnoringModifiers] characterAtIndex: 0]; key = [[o_event charactersIgnoringModifiers] characterAtIndex: 0];
/* handle Lion's default key combo for fullscreen-toggle in addition to our own hotkeys */
if( key == 'f' && i_pressed_modifiers & NSControlKeyMask && i_pressed_modifiers & NSCommandKeyMask )
{
[[VLCCoreInteraction sharedInstance] toggleFullscreen];
return YES;
}
switch( key ) switch( key )
{ {
case NSDeleteCharacter: case NSDeleteCharacter:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment