1 files changed, 35 insertions, 5 deletions

diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp
index 81d7cb8..6354ce7 100644
--- a/src/gui/styles/qgtkstyle.cpp
+++ b/src/gui/styles/qgtkstyle.cpp
@@ -38,7 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #include "qgtkstyle.h"
 
 #if !defined(QT_NO_STYLE_GTK)
@@ -138,6 +137,30 @@ static const char * const dock_widget_restore_xpm[] =
     };
 
 
+class QGtkStyleFilter : public QObject
+{
+public:
+    QGtkStyleFilter() {
+        qApp->installEventFilter(this);
+    }
+
+private:
+    bool eventFilter(QObject *obj, QEvent *e);
+};
+
+bool QGtkStyleFilter::eventFilter(QObject *obj, QEvent *e)
+{
+    if (e->type() == QEvent::ApplicationPaletteChange) {
+        // Only do this the first time since this will also
+        // generate applicationPaletteChange events
+        extern QHash<QByteArray, QPalette> *qt_app_palettes_hash(); //qapplication.cpp
+        if (!qt_app_palettes_hash() ||  qt_app_palettes_hash()->isEmpty()) {
+            QGtk::applyCustomPaletteHash();
+        }
+    }
+    return QObject::eventFilter(obj, e);
+}
+
 class QGtkStylePrivate : public QCleanlooksStylePrivate
 {
     Q_DECLARE_PUBLIC(QGtkStyle)
@@ -145,6 +168,7 @@ public:
     QGtkStylePrivate()
             : QCleanlooksStylePrivate()
     {}
+    QGtkStyleFilter filter;
 };
 
 static const int groupBoxBottomMargin    =  2;  // space below the groupbox
@@ -217,6 +241,7 @@ static QString uniqueName(const QString &key, const QStyleOption *option, const
     Constructs a QGtkStyle object.
 */
 QGtkStyle::QGtkStyle()
+    : QCleanlooksStyle(*new QGtkStylePrivate)
 {
     QGtk::initGtkWidgets();
 }
@@ -313,7 +338,7 @@ void QGtkStyle::polish(QPalette &palette)
     if (!QGtk::isThemeAvailable())
         QCleanlooksStyle::polish(palette);
     else
-        palette = standardPalette();
+        palette = palette.resolve(standardPalette());
 }
 
 /*!
@@ -328,6 +353,7 @@ void QGtkStyle::polish(QApplication *app)
     if (app->desktopSettingsAware() && QGtk::isThemeAvailable()) {
         QApplicationPrivate::setSystemPalette(standardPalette());
         QApplicationPrivate::setSystemFont(QGtk::getThemeFont());
+        QGtk::applyCustomPaletteHash();
         if (!QGtk::isKDE4Session()) {
             qt_filedialog_open_filename_hook = &QGtk::openFilename;
             qt_filedialog_save_filename_hook = &QGtk::saveFilename;
@@ -357,12 +383,12 @@ void QGtkStyle::unpolish(QApplication *app)
 /*!
     \reimp
 */
+
 void QGtkStyle::polish(QWidget *widget)
 {
     QCleanlooksStyle::polish(widget);
     if (!QGtk::isThemeAvailable())
         return;
-
     if (qobject_cast<QAbstractButton*>(widget)
             || qobject_cast<QToolButton*>(widget)
             || qobject_cast<QComboBox*>(widget)
@@ -375,8 +401,6 @@ void QGtkStyle::polish(QWidget *widget)
         widget->setAttribute(Qt::WA_Hover);
     else if (QTreeView *tree = qobject_cast<QTreeView *> (widget))
         tree->viewport()->setAttribute(Qt::WA_Hover);
-
-    QGtk::applyGtkSystemPalette(widget);
 }
 
 /*!
@@ -647,6 +671,12 @@ void QGtkStyle::drawPrimitive(PrimitiveElement element,
 
     switch (element) {
       case PE_Frame: {
+        if (widget && widget->inherits("QComboBoxPrivateContainer")){
+            QStyleOption copy = *option;
+            copy.state |= State_Raised;
+            drawPrimitive(PE_PanelMenu, &copy, painter, widget);
+            break;
+        }
         // Drawing the entire itemview frame is very expensive, especially on the native X11 engine
         // Instead we cheat a bit and draw a border image without the center part, hence only scaling
         // thin rectangular images