summaryrefslogtreecommitdiffstats
path: root/kicker/kicker/ui/k_mnu.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-28 03:25:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-28 03:25:47 +0000
commit0c7d4bb71f9bb7ec47eccd57523c38dac41abed1 (patch)
tree3823b6cafc980efc7c54e923a092eb779407fd6d /kicker/kicker/ui/k_mnu.cpp
parentf1fdec42303ca53d085302ea2af9110cd1d79570 (diff)
downloadtdebase-0c7d4bb71f9bb7ec47eccd57523c38dac41abed1.tar.gz
tdebase-0c7d4bb71f9bb7ec47eccd57523c38dac41abed1.zip
Fix the following problems under Qt4:
* Konsole compilation failure * ksplash exit failure * kicker rounded tip masking behaviour * kwin auto-exit issue git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1223001 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker/kicker/ui/k_mnu.cpp')
-rw-r--r--kicker/kicker/ui/k_mnu.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index 06fc689f6..b6d0db296 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -120,6 +120,9 @@ void PanelKMenu::hideMenu()
{
hide();
+#ifdef USE_QT4
+ // The hacks below aren't needed any more because Qt4 supports true transparency for the fading logout screen
+#else // USE_QT4
// Try to redraw the area under the menu
// Qt makes this surprisingly difficult to do in a timely fashion!
while (isShown() == true)
@@ -143,6 +146,7 @@ void PanelKMenu::hideMenu()
delaytimer->start( 100, TRUE ); // Wait for 100 milliseconds
while (windowTimerTimedOut == false)
kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000);
+#endif // USE_QT4
}
void PanelKMenu::windowClearTimeout()