1 files changed, 2 insertions, 12 deletions

diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp
index 4653639..2b6eaa4 100644
--- a/noncore/styles/liquid/liquid.cpp
+++ b/noncore/styles/liquid/liquid.cpp
@@ -151,33 +151,24 @@ bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev)
                     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();
-        }
-    }
     return(false);
 }
 
 
 LiquidStyle::LiquidStyle()
     :QWindowsStyle()
 {
     setName ( "LiquidStyle" );
 
     btnMaskBmp = QBitmap(37, 26, buttonmask_bits, true);
     btnMaskBmp.setMask(btnMaskBmp);
     htmlBtnMaskBmp = QBitmap(37, 26, htmlbuttonmask_bits, true);
@@ -828,26 +819,25 @@ void LiquidStyle::polish(QPalette &appPal)
 
 }
 
 void LiquidStyle::polish(QWidget *w)
 {
     if(w->inherits("QMenuBar")){
         //((QFrame*)w)->setLineWidth(0);
         w->setBackgroundMode(QWidget::PaletteBackground);
         return;
     }
     if(w->inherits("QPopupMenu"))
         w->setBackgroundMode(QWidget::NoBackground);
-    else if(w-> testWFlags(Qt::WType_Popup)) {
-            printf("install popup: %s\n", w-> className ( ));
+    else if(w-> testWFlags(Qt::WType_Popup) && !w->inherits("QListBox")) {
             w->installEventFilter(menuHandler);
     }
     
     if(w->isTopLevel()){
         return;
     }
    
     
     w-> setBackgroundOrigin ( QWidget::ParentOrigin );
 
     if(w->inherits("QComboBox") ||
        w->inherits("QLineEdit") || w->inherits("QRadioButton") ||
@@ -923,25 +913,25 @@ void LiquidStyle::polish(QWidget *w)
 }
 
 void LiquidStyle::unPolish(QWidget *w)
 {
     if(w->inherits("QMenuBar")){
         ((QFrame *)w)->setLineWidth(1);
         w->setBackgroundMode(QWidget::PaletteBackground);
         return;
     }
 
     if(w->inherits("QPopupMenu"))
         w->setBackgroundMode(QWidget::PaletteButton);
-    else if(w-> testWFlags(Qt::WType_Popup)) {
+    else if(w-> testWFlags(Qt::WType_Popup) && !w->inherits("QListBox")) {
             w->removeEventFilter(menuHandler);
     }
 
     if(w->isTopLevel())
         return;
 
     // for viewport children, don't just check for NoBackground....
     bool isViewportChild = w->parent() &&
         ((qstrcmp(w->parent()->name(), "qt_viewport") == 0) ||
          (qstrcmp(w->parent()->name(), "qt_clipped_viewport") == 0));
 
     w->setPalette(QApplication::palette());