Merge lp:~nick-dedekind/nux/double-click-fix into lp:nux

[Nick Dedekind]

Do not send second click event when double-clicking mouse.

Do not send second click event when double-clicking mouse.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:782
http://jenkins.qa.ubuntu.com/job/nux-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-raring-amd64-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-raring-armhf-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-raring-i386-ci/32

Click here to trigger a rebuild:
http://s-jenkins:8080/job/nux-ci/32/rebuild

review: Approve (continuous-integration)

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

=== modified file 'Nux/WindowCompositor.cpp'
--- Nux/WindowCompositor.cpp	2012-12-08 01:03:38 +0000
+++ Nux/WindowCompositor.cpp	2013-05-02 00:08:38 +0000
@@ -611,7 +611,7 @@
                                              event.GetMouseState(),
                                              event.GetKeyState());
 
-        if (mouse_owner_area_.IsValid() && mouse_over_area_ == mouse_owner_area_)
+        if (mouse_owner_area_.IsValid() && mouse_over_area_ == mouse_owner_area_ && (event.mouse_state & NUX_STATE_FIRST_EVENT) != 0)
         {
           mouse_owner_area_->EmitMouseClickSignal(mouse_owner_x, mouse_owner_y,
                                                   event.GetMouseState(),
 
=== modified file 'NuxGraphics/Events.h'
--- NuxGraphics/Events.h	2012-10-18 10:23:45 +0000
+++ NuxGraphics/Events.h	2013-05-02 00:08:38 +0000
@@ -135,6 +135,8 @@
 #define NUX_EVENT_BUTTON4           0x00080000
 
 #define NUX_EVENT_MOUSEWHEEL        0x00100000
+// Describes the event as the first press in the double click event.
+#define NUX_STATE_FIRST_EVENT       0x00200000
 // These flags describe the state of the mouse buttons.
 // They persist over several frame until the mouse buttons change state.
 // Go in mouse_state.
 
=== modified file 'NuxGraphics/GraphicsDisplayX11.cpp'
--- NuxGraphics/GraphicsDisplayX11.cpp	2013-05-01 18:14:05 +0000
+++ NuxGraphics/GraphicsDisplayX11.cpp	2013-05-02 00:08:38 +0000
@@ -1091,6 +1091,7 @@
     }
     else
     {
+      _mouse_state |= NUX_STATE_FIRST_EVENT;
       double_click_counter_ = 1;
     }
 
@@ -1182,6 +1183,11 @@
     _mouse_state |= (xevent.xbutton.state & Button2Mask) ? NUX_STATE_BUTTON2_DOWN : 0;
     _mouse_state |= (xevent.xbutton.state & Button3Mask) ? NUX_STATE_BUTTON3_DOWN : 0;
 
+    if (double_click_counter_ == 1)
+    {
+      _mouse_state |= NUX_STATE_FIRST_EVENT;
+    }
+
     if (xevent.xbutton.type == ButtonRelease)
     {
       if (xevent.xbutton.button == Button1)