Merge lp:~aacid/unity-2d/unity-2d_backport_shell_new_spread_signal into lp:unity-2d

Proposed by Albert Astals Cid
Status: Merged
Approved by: Michał Sawicz
Approved revision: 880
Merged at revision: 890
Proposed branch: lp:~aacid/unity-2d/unity-2d_backport_shell_new_spread_signal
Merge into: lp:unity-2d
Diff against target: 43 lines (+11/-1)
3 files modified
spread/app/spread.xml (+6/-0)
spread/app/spreadcontrol.cpp (+4/-1)
spread/app/spreadcontrol.h (+1/-0)
To merge this branch: bzr merge lp:~aacid/unity-2d/unity-2d_backport_shell_new_spread_signal
Reviewer Review Type Date Requested Status
Michał Sawicz Abstain
Review via email: mp+91056@code.launchpad.net

Description of the change

[spread] backport IsShownChanged signal addition in spreadcontrol from unity-2d-shell

To post a comment you must log in.
Revision history for this message
Albert Astals Cid (aacid) wrote :

Can't find a MR from this one, it comes from the unity-tv project and got lost tracing from repo copy to repo copy and branch :-/

Revision history for this message
Michał Sawicz (saviq) :
review: Approve
Revision history for this message
Michał Sawicz (saviq) wrote :

MR Approval awaiting lift of code freeze.

review: Abstain

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'spread/app/spread.xml'
2--- spread/app/spread.xml 2011-01-26 19:07:04 +0000
3+++ spread/app/spread.xml 2012-02-01 11:46:10 +0000
4@@ -52,5 +52,11 @@
5 <dox:d>True if the workspace switcher is visible.</dox:d>
6 </arg>
7 </method>
8+ <signal name="IsShownChanged">
9+ <dox:d>Signals when the workspaces switcher appears or disappears</dox:d>
10+ <arg name="IsShown" type="b" direction="out">
11+ <dox:d>True if the workspace switcher is visible</dox:d>
12+ </arg>
13+ </signal>
14 </interface>
15 </node>
16
17=== modified file 'spread/app/spreadcontrol.cpp'
18--- spread/app/spreadcontrol.cpp 2011-03-17 17:28:31 +0000
19+++ spread/app/spreadcontrol.cpp 2012-02-01 11:46:10 +0000
20@@ -36,7 +36,10 @@
21 void
22 SpreadControl::setIsShown(bool isShown)
23 {
24- m_isShown = isShown;
25+ if (isShown != m_isShown) {
26+ m_isShown = isShown;
27+ Q_EMIT IsShownChanged(isShown);
28+ }
29 if (m_isShown) {
30 m_launcherClient->beginForceVisible();
31 } else {
32
33=== modified file 'spread/app/spreadcontrol.h'
34--- spread/app/spreadcontrol.h 2011-03-17 16:05:29 +0000
35+++ spread/app/spreadcontrol.h 2012-02-01 11:46:10 +0000
36@@ -53,6 +53,7 @@
37 void showCurrentWorkspace(QString applicationDesktopFile);
38 void filterByApplication(QString applicationDesktopFile);
39 void hide();
40+ void IsShownChanged(bool isShown);
41
42 private:
43 bool m_isShown;

Subscribers

People subscribed via source and target branches