2 files changed, 10 insertions, 8 deletions

diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp
index 67e53e9..fc925b8 100644
--- a/noncore/styles/liquid/liquid.cpp
+++ b/noncore/styles/liquid/liquid.cpp
@@ -126,7 +126,7 @@ bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev)
             }
 
-            if (p->inherits("QPopupMenu"))
-                pixDict.insert(p->winId(), pix);
-            else {
+            pixDict.insert(p->winId(), pix);
+            
+            if (!p->inherits("QPopupMenu")) {
                     p->setBackgroundPixmap(*pix);
                     
@@ -147,8 +147,7 @@ bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev)
 //            qWarning("Deleting menu pixmap, width %d", pixDict.find(p->winId())->width());
 
-            if (p->inherits("QPopupMenu"))
-                pixDict.remove(p->winId());
-            else {
-                    p->setBackgroundMode(QWidget::PaletteBackground);
+            pixDict.remove(p->winId());
+            if (!p->inherits("QPopupMenu")) {
+                p->setBackgroundMode(QWidget::PaletteBackground);
 
                     QObjectList *ol = p-> queryList("QWidget");
@@ -846,5 +845,6 @@ void LiquidStyle::polish(QWidget *w)
    
     
-    w-> setBackgroundOrigin ( QWidget::ParentOrigin );
+    if ( !w-> inherits("QFrame") || (((QFrame*) w)-> frameShape () == QFrame::NoFrame ))
+            w-> setBackgroundOrigin ( QWidget::ParentOrigin );
 
     if(w->inherits("QComboBox") ||
diff --git a/noncore/styles/liquid/plugin.cpp b/noncore/styles/liquid/plugin.cpp
index f149c29..5f4c8e5 100644
--- a/noncore/styles/liquid/plugin.cpp
+++ b/noncore/styles/liquid/plugin.cpp
@@ -110,2 +110,4 @@ QRESULT LiquidSettingsInterface::queryInterface ( const QUuid &uuid, QUnknownInt
 }
 
+// Hack for Retail Z experiments
+extern "C" { QStyle *allocate ( ) { return new LiquidStyle ( ); } }