[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kicker
From:       Stefan Nikolaus <stefan.nikolaus () kdemail ! net>
Date:       2005-04-16 21:14:41
Message-ID: 20050416211441.88FB13CA () office ! kde ! org
[Download RAW message or body]

CVS commit by nikolaus: 

- Fix positioning of task button mouse over effects.
- Eliminate some code duplication.


  M +10 -0     share/kickertip.cpp   1.13
  M +1 -0      share/kickertip.h   1.6
  M +1 -7      share/panelbutton.cpp   1.35
  M +4 -8      taskbar/taskcontainer.cpp   1.118


--- kdebase/kicker/share/kickertip.cpp  #1.12:1.13
@@ -327,4 +327,14 @@ void KickerTip::hide()
 }
 
+void KickerTip::hideDelayed(const QWidget *w)
+{
+    if (m_tippingEnabled > 0 &&
+        m_tippingFor == w &&
+        isVisible())
+    {
+        m_timer.start(KickerSettings::mouseOversHideDelay(), true);
+    }
+}
+
 #include <kickertip.moc>
 

--- kdebase/kicker/share/kickertip.h  #1.5:1.6
@@ -56,4 +56,5 @@ public:
     bool isTippingFor(const QWidget* w) const;
     void hide();
+    void hideDelayed(const QWidget* w);
 
 protected:

--- kdebase/kicker/share/panelbutton.cpp  #1.34:1.35
@@ -416,11 +416,5 @@ void PanelButton::leaveEvent(QEvent* e)
     }
 
-    if (KickerTip::tippingEnabled() &&
-        KickerTip::the()->isTippingFor(this) &&
-        KickerTip::the()->isVisible())
-    {
-        QTimer::singleShot(KickerSettings::mouseOversHideDelay(),
-                           this, SLOT(hideMouseOver()));
-    }
+    KickerTip::the()->hideDelayed(this);
 
     if (m_highlight)

--- kdebase/kicker/taskbar/taskcontainer.cpp  #1.117:1.118
@@ -1158,11 +1158,5 @@ void TaskContainer::enterEvent(QEvent* e
 void TaskContainer::leaveEvent(QEvent* e)
 {
-    if (KickerTip::tippingEnabled() &&
-        KickerTip::the()->isTippingFor(this) &&
-        KickerTip::the()->isVisible())
-    {
-        QTimer::singleShot(KickerSettings::mouseOversHideDelay(),
-                           this, SLOT(hideMouseOver()));
-    }
+    KickerTip::the()->hideDelayed(this);
 
     QToolButton::leaveEvent(e);
@@ -1366,5 +1360,7 @@ void TaskContainer::showMouseOver()
     KickerTip::the()->display(this->name(), desktopNames.join( ", " ), pixmap);
 
-    QPoint p = KickerLib::popupPosition(KPanelApplet::Up,
+    // FIXME: Qt::ArrowType now has the same order as KPanelApplet::Direction.
+    //        This is not nescessarily true in the future.
+    QPoint p = KickerLib::popupPosition((KPanelApplet::Direction) arrowType,
                                         KickerTip::the(),
                                         this);


[prev in list] [next in list] [prev in thread] [next in thread]