summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSami Merila <sami.merila@nokia.com>2010-10-21 12:51:35 (GMT)
committerSami Merila <sami.merila@nokia.com>2010-10-21 12:51:35 (GMT)
commit4dc810be62a26efceaea827ce8d979aceadfbe48 (patch)
treee7d5a0000e4654e3cd16ae30d729e8f9c5f5b04b
parent131774bb881a8a80503f4719fc7a7459521acdf0 (diff)
downloadQt-4dc810be62a26efceaea827ce8d979aceadfbe48.zip
Qt-4dc810be62a26efceaea827ce8d979aceadfbe48.tar.gz
Qt-4dc810be62a26efceaea827ce8d979aceadfbe48.tar.bz2
QS60Style: The QComboBox/QSpinBox text color is not according to theme
Theme text colors are incorrect for spinboxes and comboboxes, they should have same theme colors as lineedit has, as they are using same graphic for "editor" sub-control in them. Task-number: QT-4176 Reviewed-by: Miikka Heikkinen
-rw-r--r--src/gui/styles/qs60style.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index 50e8a5b..ca3a9d0 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -837,11 +837,8 @@ void QS60StylePrivate::setThemePaletteHash(QPalette *palette) const
s60Color(QS60StyleEnums::CL_QsnTextColors, 24, 0));
QApplication::setPalette(widgetPalette, "QLineEdit");
QApplication::setPalette(widgetPalette, "QTextEdit");
- widgetPalette = *palette;
-
- widgetPalette.setColor(QPalette::HighlightedText,
- s60Color(QS60StyleEnums::CL_QsnTextColors, 24, 0));
QApplication::setPalette(widgetPalette, "QComboBox");
+ QApplication::setPalette(widgetPalette, "QSpinBox");
widgetPalette = *palette;
widgetPalette.setColor(QPalette::WindowText, s60Color(QS60StyleEnums::CL_QsnTextColors, 7, 0));