Unity

Merge lp:~3v1n0/unity/dnd-icon-dash-hide into lp:unity

  1. dnd-icon-dash-hide
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Andrea Azzarone
Approved revision: no longer in the source branch.
Merged at revision: 3855
Proposed branch: lp:~3v1n0/unity/dnd-icon-dash-hide
Merge into: lp:unity
Diff against target: 19 lines (+2/-0)
1 file modified
launcher/ApplicationLauncherIcon.cpp (+2/-0)
To merge this branch: bzr merge lp:~3v1n0/unity/dnd-icon-dash-hide
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Andrea Azzarone (community) Approve
Review via email: mp+228844@code.launchpad.net

Commit message

ApplicationLauncherIcon: make sure we close the dash if DnD is accepted

And we're about to focus the application window(s)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3845
http://jenkins.qa.ubuntu.com/job/unity-ci/1039/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/126/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/126/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/126/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1039/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Azzarone (azzar1) wrote :

LGTM.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3845
http://jenkins.qa.ubuntu.com/job/unity-ci/1048/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/135
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/135
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/135

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1048/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp 2014-06-07 16:27:16 +0000
+++ launcher/ApplicationLauncherIcon.cpp 2014-07-30 13:18:26 +0000
@@ -33,6 +33,7 @@
33#include "MultiMonitor.h"33#include "MultiMonitor.h"
34#include "unity-shared/DesktopApplicationManager.h"34#include "unity-shared/DesktopApplicationManager.h"
35#include "unity-shared/GnomeFileManager.h"35#include "unity-shared/GnomeFileManager.h"
36#include "unity-shared/UBusWrapper.h"
36#include "unity-shared/UBusMessages.h"37#include "unity-shared/UBusMessages.h"
37#include "unity-shared/UScreen.h"38#include "unity-shared/UScreen.h"
3839
@@ -1168,6 +1169,7 @@
1168 if (!IsRunning())1169 if (!IsRunning())
1169 return false;1170 return false;
11701171
1172 UBusManager::SendMessage(UBUS_OVERLAY_CLOSE_REQUEST);
1171 Focus(ActionArg(ActionArg::Source::LAUNCHER, 1, timestamp));1173 Focus(ActionArg(ActionArg::Source::LAUNCHER, 1, timestamp));
11721174
1173 if (GetWindows(WindowFilter::ON_CURRENT_DESKTOP).size() > 1)1175 if (GetWindows(WindowFilter::ON_CURRENT_DESKTOP).size() > 1)