Unity

Merge lp:~3v1n0/unity/icon-pips-monitor-update into lp:unity

  1. icon-pips-monitor-update
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Brandon Schaefer
Approved revision: no longer in the source branch.
Merged at revision: 3758
Proposed branch: lp:~3v1n0/unity/icon-pips-monitor-update
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/icon-pips-monitor-update
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Brandon Schaefer (community) Approve
Review via email: mp+213864@code.launchpad.net

Commit message

ApplicationLauncherIcon: recompute pips when the screen geometry changes

To post a comment you must log in.
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM

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

PASSED: Continuous integration, rev:3749
http://jenkins.qa.ubuntu.com/job/unity-ci/846/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/382
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/378
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/380

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'launcher/ApplicationLauncherIcon.cpp'
2--- launcher/ApplicationLauncherIcon.cpp 2014-03-21 04:49:06 +0000
3+++ launcher/ApplicationLauncherIcon.cpp 2014-04-02 14:41:30 +0000
4@@ -34,6 +34,7 @@
5 #include "unity-shared/DesktopApplicationManager.h"
6 #include "unity-shared/GnomeFileManager.h"
7 #include "unity-shared/UBusMessages.h"
8+#include "unity-shared/UScreen.h"
9
10 #include <glib/gi18n-lib.h>
11 #include <gio/gdesktopappinfo.h>
12@@ -87,6 +88,7 @@
13 wm.window_moved.connect(sigc::mem_fun(this, &ApplicationLauncherIcon::OnWindowMoved));
14 wm.screen_viewport_switch_ended.connect(sigc::mem_fun(this, &ApplicationLauncherIcon::EnsureWindowState));
15 wm.terminate_expo.connect(sigc::mem_fun(this, &ApplicationLauncherIcon::EnsureWindowState));
16+ UScreen::GetDefault()->changed.connect(sigc::hide(sigc::hide(sigc::mem_fun(this, &ApplicationLauncherIcon::EnsureWindowState))));
17
18 EnsureWindowState();
19 }