macosx: do not handle triple clicks explicitely master
authorDavid Fuhrmann <david.fuhrmann@googlemail.com>
Tue, 25 Mar 2014 18:05:23 +0000 (19:05 +0100)
committerFelix Paul Kühne <fkuehne@videolan.org>
Wed, 26 Mar 2014 08:50:44 +0000 (09:50 +0100)
refs #11061

(cherry picked from commit c877b353969c78b7e98b71a8e5cdf0013ec03826)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
Conflicts:
modules/gui/macosx/VideoView.m

modules/gui/macosx/VideoView.m

index f15b9b7..c9a5120 100644 (file)
@@ -189,19 +189,13 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
 
 - (void)mouseDown:(NSEvent *)o_event
 {
-    if( ( [o_event type] == NSLeftMouseDown ) &&
-       ( ! ( [o_event modifierFlags] &  NSControlKeyMask ) ) )
-    {
-        if( [o_event clickCount] > 1 )
-        {
-            /* multiple clicking */
+    if (([o_event type] == NSLeftMouseDown) && (! ([o_event modifierFlags] &  NSControlKeyMask))) {
+        if ([o_event clickCount] == 2)
             [[VLCCoreInteraction sharedInstance] toggleFullscreen];
-        }
-    }
-    else if( ( [o_event type] == NSRightMouseDown ) ||
-            ( ( [o_event type] == NSLeftMouseDown ) &&
-             ( [o_event modifierFlags] &  NSControlKeyMask ) ) )
-    {
+
+    } else if (([o_event type] == NSRightMouseDown) ||
+               (([o_event type] == NSLeftMouseDown) &&
+               ([o_event modifierFlags] &  NSControlKeyMask)))
         [NSMenu popUpContextMenu: [[VLCMainMenu sharedInstance] voutMenu] withEvent: o_event forView: self];
     }