Merge lp:~azzar1/unity/fix-735031 into lp:unity

Proposed by Andrea Azzarone
Status: Merged
Approved by: Neil J. Patel
Approved revision: no longer in the source branch.
Merged at revision: 1229
Proposed branch: lp:~azzar1/unity/fix-735031
Merge into: lp:unity
Diff against target: 16 lines (+6/-0)
1 file modified
src/Launcher.cpp (+6/-0)
To merge this branch: bzr merge lp:~azzar1/unity/fix-735031
Reviewer Review Type Date Requested Status
Neil J. Patel (community) Approve
Review via email: mp+63529@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Neil J. Patel (njpatel) wrote :

Approved, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp 2011-06-02 17:24:00 +0000
+++ src/Launcher.cpp 2011-06-06 09:12:33 +0000
@@ -3071,6 +3071,12 @@
30713071
3072void Launcher::RecvMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags)3072void Launcher::RecvMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags)
3073{3073{
3074 /* FIXME: nux doesn't give nux::GetEventButton (button_flags) there, relying
3075 * on an internal Launcher property then
3076 */
3077 if (_last_button_press != 1)
3078 return;
3079
3074 SetMousePosition (x, y);3080 SetMousePosition (x, y);
3075 3081
3076 // FIXME: hack (see SetupRenderArg)3082 // FIXME: hack (see SetupRenderArg)