V0.9.5

kupiqu · Sep 1, 2020 · 9999e37 · 9999e37
1 parent 1e078fb
commit 9999e37
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 project(sierrabreezeenhanced)
-set(PROJECT_VERSION "0.9.4")
+set(PROJECT_VERSION "0.9.5")
 set(PROJECT_VERSION_MAJOR 0)
 
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+V0.9.5
+---------
+
+* Upstream sync: Port away from deprecated Qt::MidButton
+* Upstream sync: use linear animations
+
 V0.9.4
 ---------
 

diff --git a/breezebutton.cpp b/breezebutton.cpp
@@ -25,7 +25,6 @@
 #include <KIconLoader>
 
 #include <QPainter>
-#include <QVariantAnimation>
 #include <QPainterPath>
 
 namespace Breeze
@@ -46,7 +45,8 @@ namespace Breeze
         // 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 );
+        // Linear to have the same easing as Breeze animations
+        m_animation->setEasingCurve( QEasingCurve::Linear );
         connect(m_animation, &QVariantAnimation::valueChanged, this, [this](const QVariant &value) {
             setOpacity(value.toReal());
         });

diff --git a/breezebutton.h b/breezebutton.h
@@ -27,6 +27,8 @@
 #include <QHash>
 #include <QImage>
 
+#include <QVariantAnimation>
+
 class QVariantAnimation;
 
 namespace Breeze

diff --git a/breezedecoration.cpp b/breezedecoration.cpp
@@ -45,7 +45,6 @@
 #include <QPainter>
 #include <QTextStream>
 #include <QTimer>
-#include <QVariantAnimation>
 
 #if BREEZE_HAVE_X11
 #include <QX11Info>
@@ -359,7 +358,8 @@ namespace Breeze
         // 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 );
+        // Linear to have the same easing as Breeze animations
+        m_animation->setEasingCurve( QEasingCurve::Linear );
         connect(m_animation, &QVariantAnimation::valueChanged, this, [this](const QVariant &value) {
             setOpacity(value.toReal());
         });

diff --git a/breezedecoration.h b/breezedecoration.h
@@ -31,6 +31,7 @@
 
 #include <QPalette>
 #include <QVariant>
+#include <QVariantAnimation>
 
 class QVariantAnimation;
 

diff --git a/breezesizegrip.cpp b/breezesizegrip.cpp
@@ -166,7 +166,7 @@ namespace Breeze
                 break;
             }
 
-            case Qt::MidButton:
+            case Qt::MiddleButton:
             {
                 hide();
                 break;
-Original file line number
+Diff line change
@@ Expand Up / @@ -166,7 +166,7 @@ namespace Breeze @@
                     break;
                 }
-                case Qt::MidButton:
+                case Qt::MiddleButton:
                 {
                     hide();
                     break;
@@ Expand Down @@