From 8946eecd22b4810dea452dafa4e0e2f8e55c573c Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 21 Mar 2011 22:26:48 +0100
Subject: Workaround the troubles with the tabbar highlight feature.

Another fantastic patch by Johannes Trosher. Thanks :)

CCBUG:267234
---
 src/tabbar.cpp | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'src/tabbar.cpp')

diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index 557fae96..1ab357f2 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -365,15 +365,6 @@ void TabBar::tabRemoved(int index)
 
     if (ReKonfig::animatedTabHighlighting())
         removeAnimation(index);
-
-    m_tabHighlightEffect->update();
-}
-
-
-void TabBar::tabInserted(int index)
-{
-    Q_UNUSED(index);
-    m_tabHighlightEffect->update();
 }
 
 
@@ -424,8 +415,9 @@ void TabBar::setTabHighlighted(int index)
 
     if (tabTextColor(index) != highlightColor)
     {
-        if (ReKonfig::animatedTabHighlighting)
+        if (ReKonfig::animatedTabHighlighting())
         {
+            m_tabHighlightEffect->setEnabled(true);
             m_tabHighlightEffect->setProperty(propertyName, qreal(0.9));
             QPropertyAnimation *anim = new QPropertyAnimation(m_tabHighlightEffect, propertyName);
             m_highlightAnimation.insert(propertyName, anim);
@@ -463,6 +455,9 @@ void TabBar::removeAnimation(int index)
     QPropertyAnimation *anim = m_highlightAnimation.take(propertyName);
     m_animationMapper->removeMappings(anim);
     delete anim;
+
+    if (m_highlightAnimation.isEmpty())
+        m_tabHighlightEffect->setEnabled(false);
 }
 
 
-- 
cgit v1.2.1