Merge lp:~fboucault/unity-2d/panel_text_color_per_applet into lp:unity-2d/3.0

Proposed by Florian Boucault
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 592
Merged at revision: 596
Proposed branch: lp:~fboucault/unity-2d/panel_text_color_per_applet
Merge into: lp:unity-2d/3.0
Diff against target: 28 lines (+5/-2)
2 files modified
panel/app/panelmanager.cpp (+0/-2)
panel/applets/appname/appnameapplet.cpp (+5/-0)
To merge this branch: bzr merge lp:~fboucault/unity-2d/panel_text_color_per_applet
Reviewer Review Type Date Requested Status
Olivier Tilloy (community) Approve
Ugo Riboni Pending
Review via email: mp+64349@code.launchpad.net

Description of the change

[panel] Do not set the text color globally but instead for each applet that needs it.

To post a comment you must log in.
Revision history for this message
Olivier Tilloy (osomon) wrote :

Looks good, makes sense and doesn’t introduce regressions.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'panel/app/panelmanager.cpp'
2--- panel/app/panelmanager.cpp 2011-04-26 15:11:07 +0000
3+++ panel/app/panelmanager.cpp 2011-06-12 23:04:42 +0000
4@@ -54,8 +54,6 @@
5 QBrush bg(QPixmap(unity2dDirectory() + "/panel/artwork/background.png"));
6 palette.setBrush(QPalette::Window, bg);
7 palette.setBrush(QPalette::Button, bg);
8- palette.setColor(QPalette::WindowText, Qt::white);
9- palette.setColor(QPalette::ButtonText, Qt::white);
10 return palette;
11 }
12
13
14=== modified file 'panel/applets/appname/appnameapplet.cpp'
15--- panel/applets/appname/appnameapplet.cpp 2011-06-06 13:11:16 +0000
16+++ panel/applets/appname/appnameapplet.cpp 2011-06-12 23:04:42 +0000
17@@ -192,6 +192,11 @@
18 d->q = this;
19 setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum);
20
21+ QPalette palette;
22+ palette.setColor(QPalette::WindowText, Qt::white);
23+ palette.setColor(QPalette::ButtonText, Qt::white);
24+ setPalette(palette);
25+
26 d->setupWindowHelper();
27 d->setupLabel();
28 d->setupWindowButtonWidget();

Subscribers

People subscribed via source and target branches