From 2f36bfcca59703705a38d6628b0782200aaeec6b Mon Sep 17 00:00:00 2001
From: shangxiaoyang <shangxiaoyang@kylinos.cn>
Date: Mon, 18 Dec 2023 01:29:30 +0000
Subject: [PATCH] !63 fixI7IES3 Merge pull request !63 from
 jiawei/openkylin/yangtze

---
 debian/changelog                       | 10 ++++
 debian/patches/0033-63-fixI7IES3.patch | 80 ++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 91 insertions(+)
 create mode 100644 debian/patches/0033-63-fixI7IES3.patch

diff --git a/debian/changelog b/debian/changelog
index d3bfac0..340838b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+kylin-music (1.1.0.47-ok7.6) yangtze; urgency=medium
+
+  * BUG: #I7IES3 【音乐】切换到精简模式时概率性会先闪一下音乐应用窗口再变为精简模式 
+  * 任务号：无
+  * 需求号：无
+  * 其他改动说明：无
+  * 其他改动影响域：无
+
+ -- jiawei <jiawei@kylinos.cn>  Mon, 18 Dec 2023 09:11:23 +0800
+
 kylin-music (1.1.0.47-ok7.5) yangtze; urgency=medium
 
   * BUG: #I8JOEJ 【V2.0】【不重要】【UKUI4.10】【需求 22231】【音乐】点击音量按钮，按键盘上下键无法调节音量（但此时再点一下音量调节条后，按上下键可以正常调节音量）
diff --git a/debian/patches/0033-63-fixI7IES3.patch b/debian/patches/0033-63-fixI7IES3.patch
new file mode 100644
index 0000000..418bf3a
--- /dev/null
+++ b/debian/patches/0033-63-fixI7IES3.patch
@@ -0,0 +1,80 @@
+From: shangxiaoyang <shangxiaoyang@kylinos.cn>
+Date: Mon, 18 Dec 2023 01:29:30 +0000
+Subject: !63 fixI7IES3 Merge pull request !63 from jiawei/openkylin/yangtze
+
+---
+ UI/mainwidget.cpp | 48 ++++++++++++++++++++++++------------------------
+ 1 file changed, 24 insertions(+), 24 deletions(-)
+
+diff --git a/UI/mainwidget.cpp b/UI/mainwidget.cpp
+index 728557c..39929aa 100644
+--- a/UI/mainwidget.cpp
++++ b/UI/mainwidget.cpp
+@@ -1059,34 +1059,34 @@ void Widget::mousePressEvent(QMouseEvent *event)
+ 
+ void Widget::slotShowMiniWidget()
+ {
+-    g_user_signal->hideSearchResult();
+-    // 添加过渡动画
+-    QPropertyAnimation *animation = new QPropertyAnimation(this, "windowOpacity");
+-    animation->setDuration(200);
+-    animation->setStartValue(1);
+-    animation->setEndValue(0);
+-    connect(animation, &QPropertyAnimation::valueChanged, [&](QVariant value){
+-        update();
+-    });
+-    connect(animation, &QPropertyAnimation::finished, [&](){
+-        hide();
+-        setWindowOpacity(1);
+-    });
+-
+-    QPropertyAnimation *animation_mini = new QPropertyAnimation(m_miniWidget, "windowOpacity");
+-    animation_mini->setDuration(200);
+-    animation_mini->setStartValue(0);
+-    animation_mini->setEndValue(1);
+-    connect(animation_mini, &QPropertyAnimation::valueChanged, [&](QVariant value){
+-        m_miniWidget->update();
+-    });
++//    g_user_signal->hideSearchResult();
++//    // 添加过渡动画
++//    QPropertyAnimation *animation = new QPropertyAnimation(this, "windowOpacity");
++//    animation->setDuration(200);
++//    animation->setStartValue(1);
++//    animation->setEndValue(0);
++//    connect(animation, &QPropertyAnimation::valueChanged, [&](QVariant value){
++//        update();
++//    });
++//    connect(animation, &QPropertyAnimation::finished, [&](){
++        this->hide();
++//        setWindowOpacity(1);
++//    });
++
++//    QPropertyAnimation *animation_mini = new QPropertyAnimation(m_miniWidget, "windowOpacity");
++//    animation_mini->setDuration(200);
++//    animation_mini->setStartValue(0);
++//    animation_mini->setEndValue(1);
++//    connect(animation_mini, &QPropertyAnimation::valueChanged, [&](QVariant value){
++//        m_miniWidget->update();
++//    });
+ 
+     if (Global::isWayland) {
+         kdk::UkuiStyleHelper::self()->removeHeader(this);
+         kdk::UkuiStyleHelper::self()->removeHeader((QWidget *)m_miniWidget);
+     }
+ 
+-    m_miniWidget->setWindowOpacity(0);
++    //m_miniWidget->setWindowOpacity(0);
+     m_miniWidget->showNormal();
+ 
+     if (Global::isWayland) {
+@@ -1096,8 +1096,8 @@ void Widget::slotShowMiniWidget()
+     }
+ 
+     m_miniWidget->activateWindow();
+-    animation->start(QAbstractAnimation::DeleteWhenStopped);
+-    animation_mini->start(QAbstractAnimation::DeleteWhenStopped);
++//    animation->start(QAbstractAnimation::DeleteWhenStopped);
++//    animation_mini->start(QAbstractAnimation::DeleteWhenStopped);
+ }
+ 
+ void Widget::moveWidget(QString newWidth, QString newHeight)
diff --git a/debian/patches/series b/debian/patches/series
index d8cb755..2cad2b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -30,3 +30,4 @@
 0030-55-fix-bug-I8BYQ9-I64P07.patch
 0031-57-fix-bug-I8J78R-I8J78O.patch
 0032-61-fixBugs.patch
+0033-63-fixI7IES3.patch