Merge lp:~beidl/unity/gestures-launcher-fix into lp:unity

Proposed by Alfred E. Neumayer
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 3773
Proposed branch: lp:~beidl/unity/gestures-launcher-fix
Merge into: lp:unity
Diff against target: 16 lines (+7/-0)
1 file modified
launcher/Launcher.cpp (+7/-0)
To merge this branch: bzr merge lp:~beidl/unity/gestures-launcher-fix
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Review via email: mp+215134@code.launchpad.net

Commit message

Launcher: Show and hide the launcher window OnDragUpdate() to fix the gesture animations

Description of the change

Rev. 3757 doesn't take into account the use of 4 finger gestures to show and hide the launcher.

Show and hide the launcher window in Launcher.cpp:OnDragUpdate() to fix the animation problem.

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Cool, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'launcher/Launcher.cpp'
2--- launcher/Launcher.cpp 2014-04-02 13:44:46 +0000
3+++ launcher/Launcher.cpp 2014-04-10 10:21:24 +0000
4@@ -224,6 +224,13 @@
5 {
6 drag_out_delta_x_ =
7 CLAMP(drag_out_delta_x_ + event.GetDelta().x, 0.0f, DRAG_OUT_PIXELS);
8+ if(options()->hide_mode == LAUNCHER_HIDE_AUTOHIDE)
9+ {
10+ if(drag_out_delta_x_ > 0.0f)
11+ parent_->ShowWindow(true);
12+ else
13+ parent_->ShowWindow(false);
14+ }
15 QueueDraw();
16 }
17