- Fix a memory leak (bg pixmaps for taskbar applets were never freed)

- Try to be more intelligent about stipple alignment in child widgets
  (in every app I tested the stipple is now always aligned right)

2 files changed, 6 insertions, 4 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
@@ -127,5 +127,5 @@ bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev)
 
-            if (p->inherits("QPopupMenu"))
                 pixDict.insert(p->winId(), pix);
-            else {
+            
+            if (!p->inherits("QPopupMenu")) {
             	p->setBackgroundPixmap(*pix);
@@ -148,5 +148,4 @@ bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev)
 
-            if (p->inherits("QPopupMenu"))
                 pixDict.remove(p->winId());
-            else {
+            if (!p->inherits("QPopupMenu")) {
             	p->setBackgroundMode(QWidget::PaletteBackground);
@@ -847,2 +846,3 @@ void LiquidStyle::polish(QWidget *w)
     
+    if ( !w-> inherits("QFrame") || (((QFrame*) w)-> frameShape () == QFrame::NoFrame ))
     w-> setBackgroundOrigin ( QWidget::ParentOrigin );
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
@@ -111 +111,3 @@ QRESULT LiquidSettingsInterface::queryInterface ( const QUuid &uuid, QUnknownInt
 
+// Hack for Retail Z experiments
+extern "C" { QStyle *allocate ( ) { return new LiquidStyle ( ); } }