1 files changed, 50 insertions, 1 deletions

diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp
index 5f014ad..4653639 100644
--- a/noncore/styles/liquid/liquid.cpp
+++ b/noncore/styles/liquid/liquid.cpp
@@ -84,4 +84,9 @@ void TransMenuHandler::reloadSettings()
     fgColor = QColor ( config. readEntry("TextColor", QApplication::palette().active().text().name()));
     opacity = config. readNumEntry("Opacity", 10);
+    if ( opacity < -20 )
+            opacity = 20;
+    else if ( opacity > 20 )
+            opacity = 20;
+    
     shadowText = config. readBoolEntry("ShadowText", true);
 }
@@ -89,5 +94,5 @@ void TransMenuHandler::reloadSettings()
 bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev)
 {
-    QPopupMenu *p = (QPopupMenu *)obj;
+    QWidget *p = (QWidget *)obj;
 
     if(ev->type() == QEvent::Show){
@@ -119,5 +124,19 @@ bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev)
                 QPixmapEffect::fade(*pix, (((float)opacity)+80)*0.01, color);
             }
+
+            if (p->inherits("QPopupMenu"))
             pixDict.insert(p->winId(), pix);
+            else {
+                    p->setBackgroundPixmap(*pix);
+                    
+                    QObjectList *ol = p-> queryList("QWidget");
+                                for ( QObjectListIt it( *ol ); it. current ( ); ++it ) {
+                                        QWidget *wid = (QWidget *) it.current ( );
+                                        
+                                        wid-> setBackgroundPixmap(*pix);
+                                        wid-> setBackgroundOrigin(QWidget::ParentOrigin);                               
+                }
+                                delete ol;
+                        }
         }
     }
@@ -126,5 +145,27 @@ bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev)
            type == Custom){
 //            qWarning("Deleting menu pixmap, width %d", pixDict.find(p->winId())->width());
+
+            if (p->inherits("QPopupMenu"))
             pixDict.remove(p->winId());
+            else {
+                    p->setBackgroundMode(QWidget::PaletteBackground);
+
+                    QObjectList *ol = p-> queryList("QWidget");
+                                for ( QObjectListIt it( *ol ); it. current ( ); ++it ) {
+                                        QWidget *wid = (QWidget *) it.current ( );
+                                        
+                                        wid-> setBackgroundMode( QWidget::PaletteBackground );
+                }
+                                delete ol;
+            }
+        }
+    }
+    else if(ev->type() == QEvent::Paint){
+        if(type == TransStippleBg || type == TransStippleBtn ||
+           type == Custom){
+//            qWarning("Deleting menu pixmap, width %d", pixDict.find(p->winId())->width());
+
+            if (!p->inherits("QPopupMenu"))
+                    p->erase();
         }
     }
@@ -797,4 +838,8 @@ void LiquidStyle::polish(QWidget *w)
     if(w->inherits("QPopupMenu"))
         w->setBackgroundMode(QWidget::NoBackground);
+    else if(w-> testWFlags(Qt::WType_Popup)) {
+            printf("install popup: %s\n", w-> className ( ));
+            w->installEventFilter(menuHandler);
+    }
 
     if(w->isTopLevel()){
@@ -802,4 +847,5 @@ void LiquidStyle::polish(QWidget *w)
     }
     
+    
     w-> setBackgroundOrigin ( QWidget::ParentOrigin );
 
@@ -887,4 +933,7 @@ void LiquidStyle::unPolish(QWidget *w)
     if(w->inherits("QPopupMenu"))
         w->setBackgroundMode(QWidget::PaletteButton);
+    else if(w-> testWFlags(Qt::WType_Popup)) {
+            w->removeEventFilter(menuHandler);
+    }
 
     if(w->isTopLevel())