diff options
| author | Alessandro Portale <alessandro.portale@nokia.com> | 2009-10-08 20:40:31 +0200 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@nokia.com> | 2009-10-08 21:20:45 +0200 |
| commit | e738c8c90b21ca2c3d2c5d1271fd7a06a1a32c5f (patch) | |
| tree | 873484858c8b88de646fb18cb44fa92e29b29389 /src | |
| parent | e2282deeb67c22f42f1022be110a3e24723eb913 (diff) | |
QS60Style: Re-enable color-from-skin-part extraction
After introducing native pixmap support, we had some crashes
on certain setups (e.g. 3.2 Emulator) when accessing data
that came from native pixmaps (FBServ). However, after fix
064674426ef0c446561b0c338441bb7d5ca091bf this is not
reproducable, anymore. Therefore let's re-enable color
extraction and enjoy better color palettes.
Reviewed-By: Sami Merilä
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 6bdb79e725..59787daaa2 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -706,11 +706,10 @@ void QS60StylePrivate::setThemePalette(QPalette *palette) const palette->setColor(QPalette::AlternateBase, Qt::transparent); palette->setBrush(QPalette::Base, Qt::transparent); // set button and tooltipbase based on pixel colors -// After natitive pixmap support, colorFromFrameGraphics caused reproducable crashes on some setups. -// const QColor buttonColor = colorFromFrameGraphics(SF_ButtonNormal); -// palette->setColor(QPalette::Button, buttonColor); -// const QColor toolTipColor = colorFromFrameGraphics(SF_ToolTip); -// palette->setColor(QPalette::ToolTipBase, toolTipColor); + const QColor buttonColor = colorFromFrameGraphics(SF_ButtonNormal); + palette->setColor(QPalette::Button, buttonColor); + const QColor toolTipColor = colorFromFrameGraphics(SF_ToolTip); + palette->setColor(QPalette::ToolTipBase, toolTipColor); palette->setColor(QPalette::Light, palette->color(QPalette::Button).lighter()); palette->setColor(QPalette::Dark, palette->color(QPalette::Button).darker()); palette->setColor(QPalette::Midlight, palette->color(QPalette::Button).lighter(125)); |