summaryrefslogtreecommitdiffstats
path: root/src/gui/styles/qs60style_simulated.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/styles/qs60style_simulated.cpp')
-rw-r--r--src/gui/styles/qs60style_simulated.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/styles/qs60style_simulated.cpp b/src/gui/styles/qs60style_simulated.cpp
index 7131640..929f987 100644
--- a/src/gui/styles/qs60style_simulated.cpp
+++ b/src/gui/styles/qs60style_simulated.cpp
@@ -93,9 +93,10 @@ QPixmap QS60StylePrivate::part(QS60StyleEnums::SkinParts part, const QSize &size
QPixmap result = QPixmap::fromImage(partImage);
if (flags & SF_StateDisabled) {
- // TODO: fix this
QStyleOption opt;
-// opt.palette = q->standardPalette();
+ QPalette *themePalette = QS60StylePrivate::themePalette();
+ if (themePalette)
+ opt.palette = *themePalette;
result = QApplication::style()->generatedIconPixmap(QIcon::Disabled, result, &opt);
}
@@ -268,9 +269,7 @@ void QS60Style::setS60Theme(const QHash<QString, QPicture> &parts,
QS60StyleModeSpecifics::m_colors = colors;
d->clearCaches(QS60StylePrivate::CC_ThemeChange);
d->setBackgroundTexture(qApp);
-
- foreach (QWidget *widget, QApplication::allWidgets())
- d->setThemePalette(widget);
+ d->setThemePalette(qApp);
}
QPoint qt_s60_fill_background_offset(const QWidget *targetWidget)