From 1a48510a1b6a742ee6ff8fb88414197f675c71d6 Mon Sep 17 00:00:00 2001
From: Mentalflow <312902918@qq.com>
Date: Tue, 6 Aug 2024 17:48:48 +0800
Subject: [PATCH] RibbonMessageGroup: Animation improved and blank view bug
 fixed.

---
 lib_source/qml/Qt5/RibbonMessageBarGroup.qml | 15 ++++++++-------
 lib_source/qml/Qt6/RibbonMessageBarGroup.qml | 15 ++++++++-------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/lib_source/qml/Qt5/RibbonMessageBarGroup.qml b/lib_source/qml/Qt5/RibbonMessageBarGroup.qml
index 50ce050..e7deca8 100644
--- a/lib_source/qml/Qt5/RibbonMessageBarGroup.qml
+++ b/lib_source/qml/Qt5/RibbonMessageBarGroup.qml
@@ -21,7 +21,7 @@ RibbonBlur {
 
     Behavior on implicitHeight {
         NumberAnimation {
-            duration: control.animationTime / 2
+            duration: control.animationTime
             easing.type: Easing.OutSine
         }
     }
@@ -31,13 +31,13 @@ RibbonBlur {
         onCountChanged: {
             message_list.currentIndex = count ? count - 1 : 0
             if(count === 0)
-                folded_btn.checked = true
+                clearMessages()
         }
     }
 
     Timer{
         id: auto_scroll_btn_timer
-        interval: control.animationTime
+        interval: control.animationTime * 2
         repeat: false
         onTriggered: {
             message_list.positionViewAtIndex(message_list.currentIndex, ListView.Center)
@@ -120,7 +120,7 @@ RibbonBlur {
             NumberAnimation {
                 properties: "y"
                 from: message_list.height
-                duration: control.animationTime / 2
+                duration: control.animationTime
             }
         }
         remove: Transition {
@@ -128,7 +128,7 @@ RibbonBlur {
                 property: "opacity"
                 from: 1
                 to: 0
-                duration: control.animationTime / 2
+                duration: control.animationTime
             }
         }
         ScrollBar.vertical: RibbonScrollBar {
@@ -141,7 +141,7 @@ RibbonBlur {
         }
         Behavior on height {
             NumberAnimation {
-                duration: control.animationTime / 2
+                duration: control.animationTime
                 easing.type: Easing.OutSine
             }
         }
@@ -161,7 +161,7 @@ RibbonBlur {
         color: RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,0.5) : Qt.rgba(1,1,1,0.5)
         Behavior on color {
             ColorAnimation {
-                duration: control.animationTime / 2
+                duration: control.animationTime
                 easing.type: Easing.OutSine
             }
         }
@@ -240,6 +240,7 @@ RibbonBlur {
     }
 
     function clearMessages(){
+        folded_btn.checked = true
         messageModel.clear()
         implicitHeight = 0
         barHeight = 0
diff --git a/lib_source/qml/Qt6/RibbonMessageBarGroup.qml b/lib_source/qml/Qt6/RibbonMessageBarGroup.qml
index 9663762..710f45e 100644
--- a/lib_source/qml/Qt6/RibbonMessageBarGroup.qml
+++ b/lib_source/qml/Qt6/RibbonMessageBarGroup.qml
@@ -21,7 +21,7 @@ RibbonBlur {
 
     Behavior on implicitHeight {
         NumberAnimation {
-            duration: control.animationTime / 2
+            duration: control.animationTime
             easing.type: Easing.OutSine
         }
     }
@@ -31,13 +31,13 @@ RibbonBlur {
         onCountChanged: {
             message_list.currentIndex = count ? count - 1 : 0
             if(count === 0)
-                folded_btn.checked = true
+                clearMessages()
         }
     }
 
     Timer{
         id: auto_scroll_btn_timer
-        interval: control.animationTime
+        interval: control.animationTime * 2
         repeat: false
         onTriggered: {
             message_list.positionViewAtIndex(message_list.currentIndex, ListView.Center)
@@ -120,7 +120,7 @@ RibbonBlur {
             NumberAnimation {
                 properties: "y"
                 from: message_list.height
-                duration: control.animationTime / 2
+                duration: control.animationTime
             }
         }
         remove: Transition {
@@ -128,7 +128,7 @@ RibbonBlur {
                 property: "opacity"
                 from: 1
                 to: 0
-                duration: control.animationTime / 2
+                duration: control.animationTime
             }
         }
         ScrollBar.vertical: RibbonScrollBar {
@@ -141,7 +141,7 @@ RibbonBlur {
         }
         Behavior on height {
             NumberAnimation {
-                duration: control.animationTime / 2
+                duration: control.animationTime
                 easing.type: Easing.OutSine
             }
         }
@@ -161,7 +161,7 @@ RibbonBlur {
         color: RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,0.5) : Qt.rgba(1,1,1,0.5)
         Behavior on color {
             ColorAnimation {
-                duration: control.animationTime / 2
+                duration: control.animationTime
                 easing.type: Easing.OutSine
             }
         }
@@ -240,6 +240,7 @@ RibbonBlur {
     }
 
     function clearMessages(){
+        folded_btn.checked = true
         messageModel.clear()
         implicitHeight = 0
         barHeight = 0