diff options
Diffstat (limited to 'kicker')
| -rw-r--r-- | kicker/kicker/ui/k_mnu.cpp | 4 | ||||
| -rw-r--r-- | kicker/libkicker/kickertip.cpp | 10 |
2 files changed, 9 insertions, 5 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() diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp index 69e0897f8..47a66f845 100644 --- a/kicker/libkicker/kickertip.cpp +++ b/kicker/libkicker/kickertip.cpp @@ -283,9 +283,9 @@ void KickerTip::plainMask() { TQPainter maskPainter(&m_mask); - m_mask.fill(Qt::black); + m_mask.fill(Qt::color0); - maskPainter.setBrush(Qt::white); + maskPainter.setBrush(Qt::color1); maskPainter.setPen(Qt::NoPen); //maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height()); drawRoundRect(maskPainter, m_mask.rect()); @@ -297,9 +297,9 @@ void KickerTip::dissolveMask() { TQPainter maskPainter(&m_mask); - m_mask.fill(Qt::black); + m_mask.fill(Qt::color0); - maskPainter.setBrush(Qt::white); + maskPainter.setBrush(Qt::color1); maskPainter.setPen(Qt::NoPen); //maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height()); drawRoundRect(maskPainter, m_mask.rect()); @@ -450,7 +450,7 @@ bool KickerTip::isTippingFor(const TQWidget* w) const void KickerTip::tipperDestroyed(TQObject* o) { - // we can't do a dynamic cast because we are in the process of dieing + // we can't do a dynamic cast because we are in the process of dying // so static it is. untipFor(TQT_TQWIDGET(o)); } |