Unity

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

  1. fix-735031
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Neil J. Patel
Approved revision: 1223
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
1=== modified file 'src/Launcher.cpp'
2--- src/Launcher.cpp 2011-06-02 17:24:00 +0000
3+++ src/Launcher.cpp 2011-06-06 09:12:33 +0000
4@@ -3071,6 +3071,12 @@
5
6 void Launcher::RecvMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags)
7 {
8+ /* FIXME: nux doesn't give nux::GetEventButton (button_flags) there, relying
9+ * on an internal Launcher property then
10+ */
11+ if (_last_button_press != 1)
12+ return;
13+
14 SetMousePosition (x, y);
15
16 // FIXME: hack (see SetupRenderArg)