[vlc-commits] macosx: do not handle triple clicks explicitely

[David Fuhrmann]

vlc/vlc-2.0 | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Tue Mar 25 19:05:23 2014 +0100| [aff1bbad6fae23dd7a029703a614b0cfd0dac7bf] | committer: Felix Paul Kühne

macosx: do not handle triple clicks explicitely

refs #11061

(cherry picked from commit c877b353969c78b7e98b71a8e5cdf0013ec03826)
Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>

Conflicts:
	modules/gui/macosx/VideoView.m

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=aff1bbad6fae23dd7a029703a614b0cfd0dac7bf
---

 modules/gui/macosx/VideoView.m |   18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/modules/gui/macosx/VideoView.m b/modules/gui/macosx/VideoView.m
index f15b9b7..c9a5120 100644
--- a/modules/gui/macosx/VideoView.m
+++ b/modules/gui/macosx/VideoView.m
@@ -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];
     }