Fix color in TextField and TextArea

viewTextColor is wrong here, we have to use buttonTextColor. This
follows Plasma 1, and makes texts in fields and areas in white-on-black
themes work.

BUG:333837
This commit is contained in:
Sebastian Kügler 2014-04-29 00:24:09 +02:00
parent 00923cf4a2
commit 670135db50
2 changed files with 3 additions and 3 deletions

View File

@ -365,7 +365,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.viewTextColor color: theme.buttonTextColor
selectByMouse: verticalScroll.interactive selectByMouse: verticalScroll.interactive
renderType: Text.NativeRendering renderType: Text.NativeRendering

View File

@ -319,7 +319,7 @@ FocusScope {
text: placeholderText text: placeholderText
visible: textInput.text == "" && !textField.activeFocus visible: textInput.text == "" && !textField.activeFocus
// XXX: using textColor and low opacity for theming placeholderText // XXX: using textColor and low opacity for theming placeholderText
color: theme.viewTextColor color: theme.buttonTextColor
opacity: 0.5 opacity: 0.5
elide: Text.ElideRight elide: Text.ElideRight
clip: true clip: true
@ -349,7 +349,7 @@ FocusScope {
renderType: Text.NativeRendering renderType: Text.NativeRendering
passwordCharacter: "•" passwordCharacter: "•"
selectByMouse: true selectByMouse: true
color: theme.viewTextColor color: theme.buttonTextColor
enabled: textField.enabled enabled: textField.enabled
clip: true clip: true
focus: true focus: true