Removed activation state animation

Author: tsujan

CMakeLists.txt

@@ -1,10 +1,9 @@
+cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
 
 project(breezeenhanced)
 set(PROJECT_VERSION "5.27.0")
 set(PROJECT_VERSION_MAJOR 5)
 
-cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
-
 include(WriteBasicConfigVersionFile)
 include(FeatureSummary)
 

ChangeLog

@@ -4,6 +4,7 @@ V5.27
  * Removed the option about drawing border on maximized and tiled windows (it was both ugly and confusing).
  * Removed the 1-pix empty gap below shaded windows.
  * Smaller shadow for inactive windows (without any shadow animation).
+ * Removed the activation state animation. It was redundant and wasn't consistent with Qt's activation state (which Kvantum supports).
 
  V5.26
 ---------

NEWS

@@ -1,5 +1,5 @@
 Latest version:
 
-	14 Mar 2023, V5.27
+	24 Mar 2023, V5.27
 
 See "ChangeLog" for changes.

breezedecoration.cpp

@@ -150,7 +150,6 @@ namespace Breeze
     //________________________________________________________________
     Decoration::Decoration(QObject *parent, const QVariantList &args)
         : KDecoration2::Decoration(parent, args)
-        , m_animation( new QVariantAnimation( this ) )
     {
         g_sDecoCount++;
     }
@@ -166,28 +165,13 @@ namespace Breeze
         }
     }
 
-    //________________________________________________________________
-    void Decoration::setOpacity(qreal value)
-    {
-        if (m_opacity == value)
-            return;
-        m_opacity = value;
-        update();
-    }
-
     //________________________________________________________________
     QColor Decoration::titleBarColor() const
     {
 
         const auto c = client().toStrongRef();
         if( hideTitleBar() ) return c->color( ColorGroup::Inactive, ColorRole::TitleBar );
-        else if( m_animation->state() == QAbstractAnimation::Running )
-        {
-            return KColorUtils::mix(
-                c->color( ColorGroup::Inactive, ColorRole::TitleBar ),
-                c->color( ColorGroup::Active, ColorRole::TitleBar ),
-                m_opacity );
-        } else return c->color( c->isActive() ? ColorGroup::Active : ColorGroup::Inactive, ColorRole::TitleBar );
+        return c->color( c->isActive() ? ColorGroup::Active : ColorGroup::Inactive, ColorRole::TitleBar );
 
     }
 
@@ -196,13 +180,7 @@ namespace Breeze
     {
 
         const auto c = client().toStrongRef();
-        if( m_animation->state() == QAbstractAnimation::Running )
-        {
-            return KColorUtils::mix(
-                c->color( ColorGroup::Inactive, ColorRole::Foreground ),
-                c->color( ColorGroup::Active, ColorRole::Foreground ),
-                m_opacity );
-        } else return  c->color( c->isActive() ? ColorGroup::Active : ColorGroup::Inactive, ColorRole::Foreground );
+        return  c->color( c->isActive() ? ColorGroup::Active : ColorGroup::Inactive, ColorRole::Foreground );
 
     }
 
@@ -211,15 +189,6 @@ namespace Breeze
     {
         const auto c = client().toStrongRef();
 
-        // active state change animation
-        // It is important start and end value are of the same type, hence 0.0 and not just 0
-        m_animation->setStartValue( 0.0 );
-        m_animation->setEndValue( 1.0 );
-        m_animation->setEasingCurve( QEasingCurve::InOutQuad );
-        connect(m_animation, &QVariantAnimation::valueChanged, this, [this](const QVariant &value) {
-            setOpacity(value.toReal());
-        });
-
         reconfigure();
         updateTitleBar();
         auto s = settings();
@@ -253,7 +222,7 @@ namespace Breeze
             }
         );
 
-        connect(c.data(), &KDecoration2::DecoratedClient::activeChanged, this, &Decoration::updateAnimationState);
+        connect(c.data(), &KDecoration2::DecoratedClient::activeChanged, this, &Decoration::updateActiveState);
         connect(c.data(), &KDecoration2::DecoratedClient::widthChanged, this, &Decoration::updateTitleBar);
         connect(c.data(), &KDecoration2::DecoratedClient::maximizedChanged, this, &Decoration::updateTitleBar);
         //connect(c, &KDecoration2::DecoratedClient::maximizedChanged, this, &Decoration::setOpaque);
@@ -293,22 +262,10 @@ namespace Breeze
     }
 
     //________________________________________________________________
-    void Decoration::updateAnimationState()
+    void Decoration::updateActiveState()
     {
-        // active and inactive shadows are different
-        updateShadow();
-
-        if (m_internalSettings->animationsEnabled())
-        {
-            const auto c = client().toStrongRef();
-            m_animation->setDirection(c->isActive() ? QAbstractAnimation::Forward : QAbstractAnimation::Backward);
-            if (m_animation->state() != QAbstractAnimation::Running)
-                m_animation->start();
-        }
-        else
-        {
-            update();
-        }
+        updateShadow(); // active and inactive shadows are different
+        update();
     }
 
     //________________________________________________________________
@@ -357,9 +314,6 @@ namespace Breeze
 
         setScaledCornerRadius();
 
-        // animation
-        m_animation->setDuration( m_internalSettings->animationsDuration() );
-
         // borders
         recalculateBorders();
 

breezedecoration.h

@@ -66,15 +66,6 @@ namespace Breeze
         //* button height
         int buttonHeight() const;
 
-        //*@name active state change animation
-        //@{
-        void setOpacity( qreal );
-
-        qreal opacity() const
-        { return m_opacity; }
-
-        //@}
-
         //*@name colors
         //@{
         QColor titleBarColor() const;
@@ -105,7 +96,7 @@ namespace Breeze
         void updateButtonsGeometry();
         void updateButtonsGeometryDelayed();
         void updateTitleBar();
-        void updateAnimationState();
+        void updateActiveState();
 
         private:
 
@@ -137,12 +128,6 @@ namespace Breeze
         KDecoration2::DecorationButtonGroup *m_leftButtons = nullptr;
         KDecoration2::DecorationButtonGroup *m_rightButtons = nullptr;
 
-        //* active state change animation
-        QVariantAnimation *m_animation;
-
-        //* active state change opacity
-        qreal m_opacity = 0;
-
         //*frame corner radius, scaled according to DPI
         qreal m_scaledCornerRadius = 3;
     };