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

Proposed by Andrea Azzarone on 2012-07-13
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2012-07-13
Approved revision: 2385
Merged at revision: 2385
Proposed branch: lp:~azzar1/unity/fix-839717-5.0
Merge into: lp:unity/5.0
Diff against target: 44 lines (+19/-0)
2 files modified
manual-tests/Launcher.txt (+17/-0)
plugins/unityshell/src/Launcher.cpp (+2/-0)
To merge this branch: bzr merge lp:~azzar1/unity/fix-839717-5.0
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) 2012-07-13 Approve on 2012-07-13
Review via email: mp+114818@code.launchpad.net

Commit message

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 :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'manual-tests/Launcher.txt'
2--- manual-tests/Launcher.txt 2012-06-22 17:21:20 +0000
3+++ manual-tests/Launcher.txt 2012-07-13 10:11:32 +0000
4@@ -556,3 +556,20 @@
5 Expected Results:
6 * The device launcher icon has been removed.
7
8+
9+Test launcher unfolds valid drop icons during dnd
10+------------------------------------------------------------
11+This test makes sure that Unity launcher unfolds valid drop icons during
12+drag and drop.
13+
14+Setup:
15+ * Add icons to the laucnher so that some of them in the bottom are folded.
16+ * Add Nautilus icon too, making sure it is folded.
17+
18+Actions:
19+ * Show Desktop
20+ * Drag a folder icon
21+
22+Expected Results:
23+ * All the valid drop icons should unfold during the drag and drop.
24+
25
26=== modified file 'plugins/unityshell/src/Launcher.cpp'
27--- plugins/unityshell/src/Launcher.cpp 2012-06-21 16:10:54 +0000
28+++ plugins/unityshell/src/Launcher.cpp 2012-07-13 10:11:32 +0000
29@@ -2741,6 +2741,7 @@
30 {
31 it->SetQuirk(AbstractLauncherIcon::QUIRK_DESAT, false);
32 it->SetQuirk(AbstractLauncherIcon::QUIRK_DROP_PRELIGHT, true);
33+ it->SetQuirk(AbstractLauncherIcon::QUIRK_PRESENTED, true);
34 }
35 else
36 {
37@@ -2777,6 +2778,7 @@
38 {
39 it->SetQuirk(AbstractLauncherIcon::QUIRK_DROP_PRELIGHT, false);
40 it->SetQuirk(AbstractLauncherIcon::QUIRK_DROP_DIM, false);
41+ it->SetQuirk(AbstractLauncherIcon::QUIRK_PRESENTED, false);
42 }
43
44 DndHoveredIconReset();

Subscribers

People subscribed via source and target branches

to all changes: