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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets/tasks
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2009-06-10 23:42:25
Message-ID: 1244677345.951349.13797.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 980041 by aseigo:

stop the mouse hover effect on mouse scroll
BUG:193814


 M  +22 -15    abstracttaskitem.cpp  
 M  +1 -0      abstracttaskitem.h  
 M  +3 -2      taskgroupitem.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/abstracttaskitem.cpp #980040:980041
@@ -281,22 +281,8 @@
 {
     Q_UNUSED(event)
 
-    if (parentGroup()) {
-        if (m_hoverEffectTimerId) {
-            killTimer(m_hoverEffectTimerId);
-            m_hoverEffectTimerId = 0;
-        }
+     stopWindowHoverEffect();
 
-#ifdef Q_WS_X11
-        Display *dpy = QX11Info::display();
-        if (m_applet->view()) {
-            const WId winId = m_applet->view()->winId();
-            Atom atom = XInternAtom(dpy, "_KDE_WINDOW_HIGHLIGHT", False);
-            XDeleteProperty(dpy, winId, atom);
-        }
-#endif
-    }
-
     QString backgroundPrefix;
     if (m_flags & TaskWantsAttention) {
         backgroundPrefix = "attention";
@@ -311,6 +297,27 @@
     fadeBackground(backgroundPrefix, 150, false);
 }
 
+void AbstractTaskItem::stopWindowHoverEffect()
+{
+    if (!parentGroup()) {
+        return;
+    }
+
+    if (m_hoverEffectTimerId) {
+        killTimer(m_hoverEffectTimerId);
+        m_hoverEffectTimerId = 0;
+    }
+
+#ifdef Q_WS_X11
+    Display *dpy = QX11Info::display();
+    if (m_applet->view()) {
+        const WId winId = m_applet->view()->winId();
+        Atom atom = XInternAtom(dpy, "_KDE_WINDOW_HIGHLIGHT", False);
+        XDeleteProperty(dpy, winId, atom);
+    }
+#endif
+}
+
 void AbstractTaskItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
     if (event->button() == Qt::LeftButton) {
--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/abstracttaskitem.h #980040:980041
@@ -182,6 +182,7 @@
     virtual void updateTask(::TaskManager::TaskChanges changes) = 0; // pure virtual function
     virtual void updateToolTip() = 0; // pure virtual function
     QString expanderElement() const;
+    void stopWindowHoverEffect();
 
 protected Q_SLOTS:
     /** Event compression **/
--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/taskgroupitem.cpp #980040:980041
@@ -1128,10 +1128,10 @@
     if (event->delta() < 0) {
         m_activeTaskIndex++;
         if (m_activeTaskIndex >= subTasks) {
-            m_activeTaskIndex = 0;
+            m_activeTaskIndex = 0; // last item is spacer
         }
+    } else {
         //mouse wheel up
-    } else {
         m_activeTaskIndex--;
         if (m_activeTaskIndex < 0) {
             m_activeTaskIndex = subTasks - 1; //last item is a spacer
@@ -1141,6 +1141,7 @@
     //kDebug() << "Wheel event m_activeTaskIndex: " << m_activeTaskIndex << " of " << subTasks;
     AbstractTaskItem *taskItem = selectSubTask(m_activeTaskIndex);
     if (taskItem) {
+        stopWindowHoverEffect();
         taskItem->activate();
     }
 }
[prev in list] [next in list] [prev in thread] [next in thread]