[vlc-devel] commit: Factorized and added missing vout_SendEventMouseVisible calls. ( Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Thu Sep 24 20:15:04 2009 +0200| [4825526146311e12940ccb89160b7f1900362d7d] | committer: Laurent Aimar 

Factorized and added missing vout_SendEventMouseVisible calls.

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

 src/video_output/display.c |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/video_output/display.c b/src/video_output/display.c
index 33c825c..538f6ef 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -445,6 +445,12 @@ static void VoutDisplayEventMouse(vout_display_t *vd, const vlc_mouse_t *mouse)
     osys->mouse.state = m;
 
     vout_SendDisplayEventMouse(osys->vout, &m);
+
+    /* */
+    osys->mouse.is_hidden = false;
+    if (!vd->info.has_hide_mouse)
+        osys->mouse.last_moved = mdate();
+    vout_SendEventMouseVisible(osys->vout);
 }
 
 static void VoutDisplayEvent(vout_display_t *vd, int event, va_list args)
@@ -485,11 +491,6 @@ static void VoutDisplayEvent(vout_display_t *vd, int event, va_list args)
             msg_Dbg(vd, "VoutDisplayEvent 'mouse' @%d,%d", x, y);
 
             /* */
-            osys->mouse.is_hidden = false;
-            if (!vd->info.has_hide_mouse)
-                osys->mouse.last_moved = mdate();
-            vout_SendEventMouseVisible(osys->vout);
-
             vlc_mouse_t m = osys->mouse.state;
             m.i_x = x;
             m.i_y = y;
@@ -513,11 +514,6 @@ static void VoutDisplayEvent(vout_display_t *vd, int event, va_list args)
         /* */
         msg_Dbg(vd, "VoutDisplayEvent 'mouse button' %d t=%d", button, event);
 
-        osys->mouse.is_hidden = false;
-        if (!vd->info.has_hide_mouse)
-            osys->mouse.last_moved = mdate();
-        vout_SendEventMouseVisible(osys->vout);
-
         vlc_mouse_t m = osys->mouse.state;
         m.b_double_click = false;
         if (event == VOUT_DISPLAY_EVENT_MOUSE_PRESSED)