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

Use the same text color as C++ Plasma::LineEdit

Browse Source 
Plasma::LineEdit uses the button text color for its text. Do the same
in PlasmaComponents.TextField to avoid white text on white background with
Oxygen theme.

Also use button text color for PC.TextArea because it uses the same
background frame as PC.TextField (P.TextEdit, its C++ equivalent, does not
have any background frame)

REVIEW: 105159
This commit is contained in:
Aurélien Gâteau 2012-06-06 12:16:44 +02:00
parent e27c827fba
commit 0aaf3f4760
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
declarativeimports/plasmacomponents/platformcomponents/touch/TextArea.qml
View File

@ -167,8 +167,7 @@ Item {
font.underline: theme.defaultFont.underline
font.weight: theme.defaultFont.weight
font.wordSpacing: theme.defaultFont.wordSpacing
//color: theme.viewTextColor
color: Qt.rgba(0,0,0,1)
color: theme.buttonTextColor
selectByMouse: verticalScroll.interactive
onCursorPositionChanged: {
@ -207,6 +206,7 @@ Item {
text: textArea.placeholderText
visible: textEdit.text == "" && !textArea.activeFocus
opacity: 0.5
color: theme.buttonTextColor
}
}
}

6
declarativeimports/plasmacomponents/platformcomponents/touch/TextField.qml
View File

@ -130,8 +130,7 @@ Item {
text: placeholderText
visible: textInput.text == "" && !textField.activeFocus
// XXX: using textColor and low opacity for theming placeholderText
// color: theme.viewTextColor
color: Qt.rgba(0,0,0,1)
color: theme.buttonTextColor
opacity: 0.5
elide: Text.ElideRight
clip: true
@ -163,8 +162,7 @@ Item {
}
selectByMouse: true
passwordCharacter: "•"
color: Qt.rgba(0,0,0,1)
//color: theme.textColor
color: theme.buttonTextColor
enabled: textField.enabled
clip: true

4
declarativeimports/plasmacomponents/qml/TextArea.qml
View File

@ -298,8 +298,7 @@ Item {
font.underline: theme.defaultFont.underline
font.weight: theme.defaultFont.weight
font.wordSpacing: theme.defaultFont.wordSpacing
color: Qt.rgba(0,0,0,1)
//color: theme.viewTextColor
color: theme.buttonTextColor
selectByMouse: verticalScroll.interactive
onCursorPositionChanged: {
@ -337,6 +336,7 @@ Item {
anchors.fill: parent
text: textArea.placeholderText
visible: textEdit.text == "" && !textArea.activeFocus
color: theme.buttonTextColor
opacity: 0.5
}
onActiveFocusChanged: {

6
declarativeimports/plasmacomponents/qml/TextField.qml
View File

@ -272,8 +272,7 @@ FocusScope {
text: placeholderText
visible: textInput.text == "" && !textField.activeFocus
// XXX: using textColor and low opacity for theming placeholderText
//color: theme.viewTextColor
color: Qt.rgba(0,0,0,1)
color: theme.buttonTextColor
opacity: 0.5
elide: Text.ElideRight
clip: true
@ -301,8 +300,7 @@ FocusScope {
}
passwordCharacter: "•"
selectByMouse: true
color: Qt.rgba(0,0,0,1)
// color: theme.textColor
color: theme.buttonTextColor
enabled: textField.enabled
clip: true
focus: true