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

Proposed by Andrea Azzarone
Status: Merged
Approved by: Andrea Azzarone
Approved revision: no longer in the source branch.
Merged at revision: 2533
Proposed branch: lp:~azzar1/unity/fix-980942
Merge into: lp:unity
Diff against target: 35 lines (+14/-2)
2 files modified
launcher/Launcher.cpp (+0/-2)
manual-tests/Launcher.txt (+14/-0)
To merge this branch: bzr merge lp:~azzar1/unity/fix-980942
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
jenkins (community) continuous-integration Needs Fixing
Review via email: mp+117899@code.launchpad.net

Commit message

Don't set mouse position on mouse leaving.

Description of the change

== Problem ==
Launcher wrongly shows top tooltip when peforming the accordion effect.

== Fix ==
Don't set mouse position on mouse leaving.

== Test ==
Manual test added.

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Manually test and works. Looks good!

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/992/console reported an error when processing this lp:~andyrock/unity/fix-980942 branch.
Not merging it.

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 2012-07-27 11:49:35 +0000
3+++ launcher/Launcher.cpp 2012-08-02 14:13:23 +0000
4@@ -2236,9 +2236,7 @@
5
6 void Launcher::RecvMouseLeave(int x, int y, unsigned long button_flags, unsigned long key_flags)
7 {
8- SetMousePosition(x, y);
9 SetStateMouseOverLauncher(false);
10- //AbstractLauncherIcon::SetSkipTooltipDelay(false);
11
12 EventLogic();
13 EnsureAnimation();
14
15=== modified file 'manual-tests/Launcher.txt'
16--- manual-tests/Launcher.txt 2012-07-27 14:09:37 +0000
17+++ manual-tests/Launcher.txt 2012-08-02 14:13:23 +0000
18@@ -676,3 +676,17 @@
19 Expected Results:
20 * The gedit window must not flicker behind the launcher.
21
22+
23+No flashing tooltips when peforming the accordion effect.
24+----------------------------------------------------
25+Setup:
26+ * Make sure the launcher setting is to never hide.
27+ * Add icons to the launcher so that some of them in the bottom are folded.
28+
29+Actions:
30+ * Quickly move the mouse pointer to the bottom-left corner.
31+ * Quickly move the mouse pointer outside the launcher area.
32+
33+Expected Result:
34+ * No icon flickers near the top panel.
35+ * See https://bugs.launchpad.net/unity/+bug/980942/+attachment/3059914/+files/launcher-accordion-effect-tooltip-bug.ogv.