alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix text colors on TabButton and ToolButton

Browse Source 
When the widgets use the button background frame, use buttonTextColor.
When they do not use any background frame, use textColor.

Avoids unreadable text with Oxygen

REVIEW: 105163
This commit is contained in:
Aurélien Gâteau 2012-06-06 12:18:57 +02:00
parent 0aaf3f4760
commit fc0f700c9d
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
declarativeimports/plasmacomponents/platformcomponents/touch/ToolButton.qml
View File

@ -213,7 +213,7 @@ Item {
font.underline: theme.defaultFont.underline font.underline: theme.defaultFont.underline
font.weight: theme.defaultFont.weight font.weight: theme.defaultFont.weight
font.wordSpacing: theme.defaultFont.wordSpacing font.wordSpacing: theme.defaultFont.wordSpacing
color: theme.buttonTextColor color: surface.opacity == 1 ? theme.buttonTextColor : theme.textColor
horizontalAlignment: icon.valid ? Text.AlignLeft : Text.AlignHCenter horizontalAlignment: icon.valid ? Text.AlignLeft : Text.AlignHCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
} }

2
declarativeimports/plasmacomponents/qml/TabButton.qml
View File

@ -140,6 +140,8 @@ Item {
elide: Text.ElideRight elide: Text.ElideRight
horizontalAlignment: !internal.portrait && iconSource != null ? Text.AlignLeft : Text.AlignHCenter horizontalAlignment: !internal.portrait && iconSource != null ? Text.AlignLeft : Text.AlignHCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
color: root.checked ? theme.buttonTextColor : theme.textColor
} }
Private.IconLoader { Private.IconLoader {

2
declarativeimports/plasmacomponents/qml/ToolButton.qml
View File

@ -215,7 +215,7 @@ Item {
font.underline: theme.defaultFont.underline font.underline: theme.defaultFont.underline
font.weight: theme.defaultFont.weight font.weight: theme.defaultFont.weight
font.wordSpacing: theme.defaultFont.wordSpacing font.wordSpacing: theme.defaultFont.wordSpacing
color: theme.buttonTextColor color: surface.opacity == 1 ? theme.buttonTextColor : theme.textColor
horizontalAlignment: icon.valid ? Text.AlignLeft : Text.AlignHCenter horizontalAlignment: icon.valid ? Text.AlignLeft : Text.AlignHCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
} }