Merge lp:~unity-team/nux/nux.fix-dx-dy-on-enter into lp:nux/2.0

[Jason Smith]

UNBLOCK

Fixes events being sent to newly entered widgets having HUGE values for dx,dy

[Neil J. Patel (njpatel)]

approved.

review: Approve

=== modified file 'Nux/WindowCompositor.cpp'
--- Nux/WindowCompositor.cpp	2012-01-20 20:37:11 +0000
+++ Nux/WindowCompositor.cpp	2012-01-30 08:37:24 +0000
@@ -417,6 +417,7 @@
         }
         else if (hit_view && (event.type == NUX_MOUSE_MOVE))
         {
+          bool emit_delta = true;
           if (hit_view != mouse_over_area_)
           {
             if (mouse_over_area_ != NULL)
@@ -433,10 +434,11 @@
             // The area we found under the mouse pointer receives a "mouse enter signal".
             SetMouseOverArea(hit_view);
             mouse_over_area_->EmitMouseEnterSignal(hit_view_x, hit_view_y, event.GetMouseState(), event.GetKeyState());
+            emit_delta = false;
           }
 
           // Send a "mouse mouse signal".
-          mouse_over_area_->EmitMouseMoveSignal(hit_view_x, hit_view_y, dx, dy, event.GetMouseState(), event.GetKeyState());
+          mouse_over_area_->EmitMouseMoveSignal(hit_view_x, hit_view_y, emit_delta ? dx : 0, emit_delta ? dy : 0, event.GetMouseState(), event.GetKeyState());
         }
         else if (hit_view && ((event.type == NUX_MOUSE_PRESSED) || (event.type == NUX_MOUSE_DOUBLECLICK)))
         {