CVS commit by aseigo: hide the mouse over no matter which way this is triggered. BUG:100450 M +16 -1 desktopbutton.cpp 1.18 M +4 -4 desktopbutton.h 1.4 --- kdebase/kicker/buttons/desktopbutton.cpp #1.17:1.18 @@ -47,5 +47,5 @@ DesktopButton::DesktopButton( QWidget* p setIcon("desktop"); - connect( this, SIGNAL(toggled(bool)), ShowDesktop::the(), SLOT(showDesktop(bool)) ); + connect( this, SIGNAL(toggled(bool)), this, SLOT(showDesktop(bool)) ); connect( ShowDesktop::the(), SIGNAL(desktopShown(bool)), this, SLOT(toggle(bool)) ); @@ -68,4 +68,19 @@ void DesktopButton::toggle(bool showDesk } +void DesktopButton::showDesktop(bool showDesktop) +{ + if (KickerSettings::showMouseOverEffects()) + { + KickerTip::enableTipping(false); + } + + ShowDesktop::the()->showDesktop(showDesktop); + + if (KickerSettings::showMouseOverEffects()) + { + KickerTip::enableTipping(true); + } +} + void DesktopButton::dragEnterEvent( QDragEnterEvent *ev ) { --- kdebase/kicker/buttons/desktopbutton.h #1.3:1.4 @@ -39,10 +39,10 @@ public: protected: virtual QString tileName() { return "DesktopButton"; } - virtual void dragEnterEvent( QDragEnterEvent *ev ); - virtual void dropEvent( QDropEvent *ev ); + virtual void dragEnterEvent(QDragEnterEvent *ev); + virtual void dropEvent(QDropEvent *ev); protected slots: - void toggle( bool ); - + void toggle(bool); + void showDesktop(bool); };