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
1=== modified file 'plugins/unityshell/src/DashView.cpp'
2--- plugins/unityshell/src/DashView.cpp 2011-09-22 09:46:55 +0000
3+++ plugins/unityshell/src/DashView.cpp 2011-09-26 10:24:24 +0000
4@@ -888,5 +888,10 @@
5 return this;
6 }
7
8+void DashView::ProcessDndEnter()
9+{
10+ ubus_manager_.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST);
11+}
12+
13 }
14 }
15
16=== modified file 'plugins/unityshell/src/DashView.h'
17--- plugins/unityshell/src/DashView.h 2011-09-14 14:40:51 +0000
18+++ plugins/unityshell/src/DashView.h 2011-09-26 10:24:24 +0000
19@@ -61,6 +61,9 @@
20
21 nux::View* default_focus() const;
22
23+protected:
24+ void ProcessDndEnter();
25+
26 private:
27 void SetupBackground();
28 void SetupViews();