Merge pull request !63 from jiawei/openkylin/yangtze
This commit is contained in:
shangxiaoyang 2023-12-18 01:29:30 +00:00 committed by Gitee
commit 0724dee954
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 33 additions and 23 deletions

View File

@ -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);
});
// 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();
});
// 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)

10
debian/changelog vendored
View File

@ -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】【音乐】点击音量按钮按键盘上下键无法调节音量但此时再点一下音量调节条后按上下键可以正常调节音量