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

Proposed by Andrea Azzarone on 2012-07-04
Status: Merged
Approved by: Andrea Azzarone on 2012-07-10
Approved revision: 2476
Merged at revision: 2489
Proposed branch: lp:~azzar1/unity/fix-839717
Merge into: lp:unity
Diff against target: 44 lines (+19/-0)
2 files modified
launcher/Launcher.cpp (+2/-0)
manual-tests/Launcher.txt (+17/-0)
To merge this branch: bzr merge lp:~azzar1/unity/fix-839717
Reviewer Review Type Date Requested Status
jenkins (community) continuous-integration Approve on 2012-07-04
Marco Trevisan (Treviño) 2012-07-04 Approve on 2012-07-04
Review via email: mp+113396@code.launchpad.net

Commit message

Unfold valid drop icons.

Description of the change

== Problem ==
Launcher - when a user starts dragging a item, any folded launcher icons that are valid drop receptacles should unfold.

== Fix ==
Use QUIRK_PRESENT to unfold a valid target icon.

== Test ==
Manual test added.

http://ubuntuone.com/0B37q9nf0vcjxVMojeSMvN

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

With manual test is now good. +1

review: Approve
jenkins (martin-mrazik+qa) wrote :

PASSED: Continuous integration, rev:2473
http://jenkins.qa.ubuntu.com/job/unity-ci/61/

review: Approve (continuous-integration)
Unity Merger (unity-merger) wrote :

Attempt to merge into lp:unity failed due to conflicts:

text conflict in manual-tests/Launcher.txt

lp:~azzar1/unity/fix-839717 updated on 2012-07-10
2476. By Andrea Azzarone on 2012-07-10

Merge trunk.

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-10 13:52:21 +0000
3+++ launcher/Launcher.cpp 2012-07-10 15:54:18 +0000
4@@ -2591,6 +2591,7 @@
5 {
6 it->SetQuirk(AbstractLauncherIcon::QUIRK_DESAT, false);
7 it->SetQuirk(AbstractLauncherIcon::QUIRK_DROP_PRELIGHT, true);
8+ it->SetQuirk(AbstractLauncherIcon::QUIRK_PRESENTED, true);
9 }
10 else
11 {
12@@ -2625,6 +2626,7 @@
13 {
14 it->SetQuirk(AbstractLauncherIcon::QUIRK_DROP_PRELIGHT, false);
15 it->SetQuirk(AbstractLauncherIcon::QUIRK_DROP_DIM, false);
16+ it->SetQuirk(AbstractLauncherIcon::QUIRK_PRESENTED, false);
17 }
18
19 DndHoveredIconReset();
20
21=== modified file 'manual-tests/Launcher.txt'
22--- manual-tests/Launcher.txt 2012-07-09 17:28:59 +0000
23+++ manual-tests/Launcher.txt 2012-07-10 15:54:18 +0000
24@@ -606,3 +606,20 @@
25 Expected Result:
26 Unity must not freeze during the drag and drop.
27
28+
29+Test launcher unfolds valid drop icons during dnd
30+------------------------------------------------------------
31+This test makes sure that Unity launcher unfolds valid drop icons during
32+drag and drop.
33+
34+Setup:
35+ * Add icons to the laucnher so that some of them in the bottom are folded.
36+ * Add Nautilus icon too, making sure it is folded.
37+
38+Actions:
39+ * Show Desktop
40+ * Drag a folder icon
41+
42+Expected Results:
43+ * All the valid drop icons should unfold during the drag and drop.
44+