diff options
| author | Sami Merilä <sami.merila@nokia.com> | 2009-12-04 14:05:34 (GMT) |
|---|---|---|
| committer | Sami Merilä <sami.merila@nokia.com> | 2009-12-04 14:05:34 (GMT) |
| commit | 63318f834671552add4fd584e5aae80523b5f007 (patch) | |
| tree | 8e5defdbd54306f64ebd71e94a73b520cd37ed75 /src/gui | |
| parent | 91921c880ea53a096237435ffac571a193f9c5f5 (diff) | |
| download | Qt-63318f834671552add4fd584e5aae80523b5f007.zip Qt-63318f834671552add4fd584e5aae80523b5f007.tar.gz Qt-63318f834671552add4fd584e5aae80523b5f007.tar.bz2 | |
Button and LineEdit/TextEdit theme colors are incorrect
QS60Style fetches incorrect color values from theme when using
buttons and lineEdits/TextEdits. New values are the same as in native
widgets (verified from native widget code).
Task-number: QTBUG-6364
Reviewed-by: Alessandro Portale
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index aece73c..be4f15a 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -654,7 +654,7 @@ void QS60StylePrivate::setThemePalette(QPalette *palette) const palette->setColor(QPalette::WindowText, s60Color(QS60StyleEnums::CL_QsnTextColors, 6, 0)); palette->setColor(QPalette::ButtonText, - s60Color(QS60StyleEnums::CL_QsnTextColors, 6, 0)); + s60Color(QS60StyleEnums::CL_QsnTextColors, 20, 0)); palette->setColor(QPalette::Text, s60Color(QS60StyleEnums::CL_QsnTextColors, 6, 0)); palette->setColor(QPalette::ToolTipText, @@ -753,13 +753,15 @@ void QS60StylePrivate::setThemePaletteHash(QPalette *palette) const QApplication::setPalette(widgetPalette, "QTableView"); widgetPalette = *palette; + widgetPalette.setColor(QPalette::Text, + s60Color(QS60StyleEnums::CL_QsnTextColors, 27, 0)); widgetPalette.setColor(QPalette::HighlightedText, s60Color(QS60StyleEnums::CL_QsnTextColors, 24, 0)); QApplication::setPalette(widgetPalette, "QLineEdit"); widgetPalette = *palette; widgetPalette.setColor(QPalette::Text, - s60Color(QS60StyleEnums::CL_QsnTextColors, 34, 0)); + s60Color(QS60StyleEnums::CL_QsnTextColors, 27, 0)); widgetPalette.setColor(QPalette::HighlightedText, s60Color(QS60StyleEnums::CL_QsnTextColors, 24, 0)); QApplication::setPalette(widgetPalette, "QTextEdit"); |