Commit b7b260e3 authored by Felix Paul Kühne's avatar Felix Paul Kühne

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

(cherry picked from commit d7df1123)
parent 157b7bbf
......@@ -120,6 +120,9 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
if( var_GetBool( p_playlist, "fullscreen") )
[[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 )
{
if( key == ' ' )
......
......@@ -1299,6 +1299,13 @@ unsigned int CocoaKeyToVLC( unichar i_key )
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 )
{
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