SVN commit 560967 by giessl: lineedit/combobox/etc. focus highlight, tab bar mouseOver, "kde toolbar widget" hack don't require eventFilter() attention anymore M +0 -89 plastik.cpp --- trunk/KDE/kdelibs/kstyles/plastik/plastik.cpp #560966:560967 @@ -808,7 +808,6 @@ renderTab(p, r, pal, mouseOver, flags&State_Selected, false, pos, true /*triangular*/, false/*cornerWidget*/, reverseLayout); return; - } // TODO: TabBar::EastTab, TabBar::WestTab, TabBar::BaseFrame, TabBar::ScrollButton @@ -1640,18 +1639,6 @@ void PlastikStyle::polish(QWidget* widget) { -// if (qobject_cast(widget)) { -// widget->installEventFilter(this); -// } else if (qobject_cast(widget)) { -// widget->setMouseTracking(true); -// widget->installEventFilter(this); -// } else if (qobject_cast(widget)) { -// widget->setBackgroundMode( Qt::NoBackground ); -// } else if ( !qstrcmp(widget->name(), "kde toolbar widget") ) { -// widget->installEventFilter(this); -// } -// - if( _animateProgressBar && qobject_cast(widget) ) { widget->installEventFilter(this); @@ -1677,15 +1664,6 @@ void PlastikStyle::unpolish(QWidget* widget) { -// if (qobject_cast(widget)) { -// widget->setMouseTracking(false); -// widget->removeEventFilter(this); -// } else if (qobject_cast(widget)) { -// widget->setBackgroundMode( Qt::PaletteBackground ); -// } else if ( !qstrcmp(widget->name(), "kde toolbar widget") ) { -// widget->removeEventFilter(this); -// } -// if ( qobject_cast(widget) ) { progAnimWidgets.remove(widget); @@ -2770,66 +2748,6 @@ if (KStyle::eventFilter(obj, ev) ) return true; -// if (!obj->isWidgetType() ) return false; -// -// // focus highlight -// if ( qobject_cast(obj) ) { -// QWidget* widget = static_cast(obj); -// -// if ( qobject_cast(widget->parentWidget()) ) -// { -// QWidget* spinbox = widget->parentWidget(); -// if ((ev->type() == QEvent::FocusIn) || (ev->type() == QEvent::FocusOut)) -// { -// spinbox->repaint(false); -// } -// return false; -// } -// -// if ((ev->type() == QEvent::FocusIn) || (ev->type() == QEvent::FocusOut)) -// { -// widget->repaint(false); -// } -// return false; -// } -// -// if ( qobject_cast(obj) ) { -// if ((ev->type() == QEvent::Enter) && static_cast(obj)->isEnabled()) -// { -// QWidget* tabbar = static_cast(obj); -// hoverWidget = tabbar; -// hoverTab = 0; -// tabbar->repaint(false); -// } -// else if (ev->type() == QEvent::MouseMove) -// { -// QTabBar *tabbar = dynamic_cast(obj); -// QMouseEvent *me = dynamic_cast(ev); -// -// if (tabbar && me) { -// // avoid unnecessary repaints (which otherwise would occour on every -// // MouseMove event causing high cpu load). -// -// bool repaint = true; -// -// QTab *tab = tabbar->selectTab(me->pos() ); -// if (hoverTab == tab) -// repaint = false; -// hoverTab = tab; -// -// if (repaint) -// tabbar->repaint(false); -// } -// } -// else if (ev->type() == QEvent::Leave) -// { -// QWidget* tabbar = static_cast(obj); -// hoverWidget = 0; -// hoverTab = 0; -// tabbar->repaint(false); -// } -// return false; -// } // Track show events for progress bars if ( _animateProgressBar && qobject_cast(obj) ) { @@ -2838,13 +2756,6 @@ animationTimer->start( 50 ); } } -// if ( !qstrcmp(obj->name(), "kde toolbar widget") ) -// { -// QWidget* lb = static_cast(obj); -// if (lb->backgroundMode() == Qt::PaletteButton) -// lb->setBackgroundMode(Qt::PaletteBackground); -// lb->removeEventFilter(this); -// } return false; }