From 2197b8be6003ad3d0071564afb7080650202661b Mon Sep 17 00:00:00 2001 From: Sami Merila Date: Wed, 29 Jun 2011 14:36:09 +0300 Subject: Fix QWidget::palettePropagation2() autotest on Symbian Autotest fails since calling QApplication::setPalette() clears away QPalette hash (class specific palette information). QS60Style tries to re-set theme-specific hash after updating application palette with real theme background, but does not take into account that application might have defined own custom palette hash data. As a fix, store the previously set palette hash information and restore it after calling QApplication::setPalette(). Additionally, remove the palette change event sending, since QApplication will post that event anyway when palette is updated. Task-number: QT-5011 Reviewed-by: Miikka Heikkinen --- src/gui/styles/qs60style_s60.cpp | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp index 5699dbb..783dc05 100644 --- a/src/gui/styles/qs60style_s60.cpp +++ b/src/gui/styles/qs60style_s60.cpp @@ -1433,12 +1433,26 @@ QPixmap QS60StylePrivate::backgroundTexture(bool skipCreation) // Notify all widgets that palette is updated with the actual background texture. QPalette pal = QApplication::palette(); pal.setBrush(QPalette::Window, *m_background); + + //Application palette hash is automatically cleared when QApplication::setPalette is called. + //To avoid losing palette hash data, back it up before calling the setPalette() API and + //restore it afterwards. + typedef QHash PaletteHash; + PaletteHash hash; + if (qt_app_palettes_hash() || !qt_app_palettes_hash()->isEmpty()) + hash = *qt_app_palettes_hash(); QApplication::setPalette(pal); - setThemePaletteHash(&pal); + if (hash.isEmpty()) { + //set default theme palette hash + setThemePaletteHash(&pal); + } else { + for (int i = 0; i < hash.count() - 1; i++) { + QByteArray widgetClassName = hash.keys().at(i); + QApplication::setPalette(hash.value(widgetClassName), widgetClassName); + } + } storeThemePalette(&pal); - foreach (QWidget *widget, QApplication::allWidgets()){ - QEvent e(QEvent::PaletteChange); - QApplication::sendEvent(widget, &e); + foreach (QWidget *widget, QApplication::allWidgets()) { setThemePalette(widget); widget->ensurePolished(); } -- cgit v0.12 From c1759aa657f5f729c96696b819465c70266c21c8 Mon Sep 17 00:00:00 2001 From: Sami Merila Date: Wed, 29 Jun 2011 14:40:24 +0300 Subject: Fix QWidget::palettePropagation2() autotest on Symbian (part 2) Add also include to QS60Style to avoid build failure. Task-number: QT-5011 Reviewed-by: Miikka Heikkinen --- src/gui/styles/qs60style_s60.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp index 783dc05..6b66a09 100644 --- a/src/gui/styles/qs60style_s60.cpp +++ b/src/gui/styles/qs60style_s60.cpp @@ -44,6 +44,7 @@ #include "qpainter.h" #include "qstyleoption.h" #include "qstyle.h" +#include "private/qapplication_p.h" #include "private/qt_s60_p.h" #include "private/qpixmap_raster_symbian_p.h" #include "private/qcore_symbian_p.h" -- cgit v0.12