-rw-r--r-- | noncore/styles/liquid/liquid.cpp | 14 | ||||
-rw-r--r-- | noncore/styles/liquid/plugin.cpp | 2 |
2 files changed, 3 insertions, 13 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 @@ -157,21 +157,12 @@ bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev) 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() @@ -834,14 +825,13 @@ void LiquidStyle::polish(QWidget *w) //((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; } @@ -929,13 +919,13 @@ void LiquidStyle::unPolish(QWidget *w) 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; diff --git a/noncore/styles/liquid/plugin.cpp b/noncore/styles/liquid/plugin.cpp index fca7c06..d9aa8ef 100644 --- a/noncore/styles/liquid/plugin.cpp +++ b/noncore/styles/liquid/plugin.cpp @@ -22,8 +22,8 @@ int major_version ( ) { return 1; } const char *description ( ) { - return "High performance liquid plugin"; + return "High Performance Liquid"; } |