Merge lp:~robertcarr/unity/dnd-closedash into lp:unity

Proposed by Robert Carr
Status: Merged
Merged at revision: 1624
Proposed branch: lp:~robertcarr/unity/dnd-closedash
Merge into: lp:unity
Diff against target: 28 lines (+8/-0)
2 files modified
plugins/unityshell/src/DashView.cpp (+5/-0)
plugins/unityshell/src/DashView.h (+3/-0)
To merge this branch: bzr merge lp:~robertcarr/unity/dnd-closedash
Reviewer Review Type Date Requested Status
Sam Spilsbury (community) Approve
Review via email: mp+76954@code.launchpad.net

Description of the change

When we start a drag inside the dash, we should close the dash when it leaves the dash.

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/unityshell/src/DashView.cpp'
--- plugins/unityshell/src/DashView.cpp 2011-09-22 09:46:55 +0000
+++ plugins/unityshell/src/DashView.cpp 2011-09-26 10:24:24 +0000
@@ -888,5 +888,10 @@
888 return this;888 return this;
889}889}
890890
891void DashView::ProcessDndEnter()
892{
893 ubus_manager_.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST);
894}
895
891}896}
892}897}
893898
=== modified file 'plugins/unityshell/src/DashView.h'
--- plugins/unityshell/src/DashView.h 2011-09-14 14:40:51 +0000
+++ plugins/unityshell/src/DashView.h 2011-09-26 10:24:24 +0000
@@ -61,6 +61,9 @@
6161
62 nux::View* default_focus() const;62 nux::View* default_focus() const;
6363
64protected:
65 void ProcessDndEnter();
66
64private:67private:
65 void SetupBackground();68 void SetupBackground();
66 void SetupViews();69 void SetupViews();