Unity

Merge lp://qastaging/~azzar1/unity/dnd-enhancements into lp://qastaging/unity

dnd-enhancements
Merge into trunk

Proposed by Andrea Azzarone on 2011-08-10

Status:

Merged

Merged at revision:

1399

Proposed branch:

lp://qastaging/~azzar1/unity/dnd-enhancements

Merge into:

lp://qastaging/unity

Diff against target:

1269 lines (+524/-203)

14 files modified

plugins/unityshell/src/AbstractLauncherIcon.h (+4/-2)
plugins/unityshell/src/BamfLauncherIcon.cpp (+99/-69)
plugins/unityshell/src/BamfLauncherIcon.h (+11/-5)
plugins/unityshell/src/DNDCollectionWindow.cpp (+63/-0)
plugins/unityshell/src/DNDCollectionWindow.h (+55/-0)
plugins/unityshell/src/DndData.cpp (+63/-0)
plugins/unityshell/src/DndData.h (+71/-0)
plugins/unityshell/src/Launcher.cpp (+120/-94)
plugins/unityshell/src/Launcher.h (+10/-8)
plugins/unityshell/src/LauncherIcon.cpp (+2/-2)
plugins/unityshell/src/LauncherIcon.h (+10/-8)
plugins/unityshell/src/MockLauncherIcon.h (+2/-2)
plugins/unityshell/src/TrashLauncherIcon.cpp (+11/-11)
plugins/unityshell/src/TrashLauncherIcon.h (+3/-2)

To merge this branch:

bzr merge lp://qastaging/~azzar1/unity/dnd-enhancements

Related bugs:

Bug #724986: Launcher reveals when dragging a window widget	Undecided	Fix Released
Bug #727901: When dragging and dropping a file on to the Launcher, the Launcher icons that are valid drop receptacles don't highlight until the cursor is over the launcher.	Medium	Fix Released
Bug #727902: Launcher icon highlighting should not switch off as soon the cursor moves after the app spread appears.	Medium	Fix Released
Bug #727920: Drag and drop auto-scroll should not fold the launcher at the end of the scroll range.	High	Fix Released
Bug #764460: Dash - As soon as a user starts dragging a file from the Dash, the Launcher icons that are valid drop receptacles should re-saturate.	High	Fix Released
Bug #765758: Dash - As soon as a user starts dragging a app from the App Lens, all Launcher icons should re-saturate.	Medium	Fix Released
Bug #773028: Any text drag causes bar to show up	Undecided	Fix Released
Bug #821538: [regression] expose have become quite slow with the last update of unity	Undecided	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Jason Smith (community)		2011-08-10	Approve on 2011-08-19
Review via email: mp+71003@code.qastaging.launchpad.net

Description of the change

THE DNDCOLLECTION WINDOW
The first objective of this branch is creating a DNDCollectionWindow to get nux/x drag and drop (dnd) data as soon as dnd starts and not when mouse pointer enters launcher window.
The DNDcolletionWindow hides itself as soon as processdndmove is called or when dnd ends (so there should be no "invisble window" problem). After that it emits a collected signal that is handled by the launcher.

THE DNDDATA CLASS
So I have created this facility class to manage the 1-N relationship between uris and uris types. This class uses std::set to avoid data duplication.

C++0x FOR
I have rewrited some for loops using new c++0x for.