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

List:       kde-commits
Subject:    KDE/kdelibs/plasma/private
From:       Marco Martin <notmart () gmail ! com>
Date:       2010-05-18 18:32:18
Message-ID: 20100518183218.9FBFDAC8B9 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1128229 by mart:

correctly disable glow on focus out


 M  +7 -2      focusindicator.cpp  


--- trunk/KDE/kdelibs/plasma/private/focusindicator.cpp #1128228:1128229
@@ -88,6 +88,12 @@
         return false;
     }
 
+    if (event->type() == QEvent::GraphicsSceneHoverEnter) {
+        m_isUnderMouse = true;
+    } else if (event->type() == QEvent::GraphicsSceneHoverLeave) {
+        m_isUnderMouse = false;
+    }
+
     if (!m_parent->hasFocus() && event->type() == QEvent::GraphicsSceneHoverEnter) {
         m_prefix = m_customPrefix + "hover";
         syncGeometry();
@@ -96,7 +102,6 @@
         m_hoverAnimation->setProperty("startPixmap", m_background->framePixmap());
         m_background->setElementPrefix("hover");
         m_hoverAnimation->setProperty("targetPixmap", m_background->framePixmap());
-        m_isUnderMouse = true;
         m_hoverAnimation->start();
     } else if (!m_parent->hasFocus() && event->type() == QEvent::GraphicsSceneHoverLeave) {
         m_prefix = m_customPrefix + "shadow";
@@ -106,7 +111,6 @@
         m_hoverAnimation->setProperty("startPixmap", m_background->framePixmap());
         m_background->setElementPrefix("shadow");
         m_hoverAnimation->setProperty("targetPixmap", m_background->framePixmap());
-        m_isUnderMouse = false;
         m_hoverAnimation->start();
     } else if (event->type() == QEvent::GraphicsSceneResize) {
         syncGeometry();
@@ -122,6 +126,7 @@
         m_prefix = m_customPrefix + "shadow";
         syncGeometry();
         m_hoverAnimation->stop();
+
         m_background->setElementPrefix("focus");
         m_hoverAnimation->setProperty("startPixmap", m_background->framePixmap());
         m_background->setElementPrefix("shadow");
[prev in list] [next in list] [prev in thread] [next in thread]