diff -Nru ukui-sidebar-4.10.3.5/debian/changelog ukui-sidebar-4.10.3.5/debian/changelog --- ukui-sidebar-4.10.3.5/debian/changelog 2025-01-08 10:02:09.000000000 +0800 +++ ukui-sidebar-4.10.3.5/debian/changelog 2025-02-13 09:43:44.000000000 +0800 @@ -1,3 +1,15 @@ +ukui-sidebar (4.10.3.5-ok0.9) nile; urgency=medium + + * Issues: + - IBKQW4 OpenKylin 2.0 SP1 更新之后,X11 session 的 CPU 占用率异常 + * 其他改动: + - 解决快捷面板声音插件在切换静音模式时显示图标异常的问题 + - 修复通知弹窗条目变化时UI异常的bug + * 其他改动影响域: + - 通知中心、快捷面板 + + -- youdiansaodongxi <guojiaqi@kylinos.cn> Thu, 13 Feb 2025 09:43:44 +0800 + ukui-sidebar (4.10.3.5-ok0.8) nile; urgency=medium * Issues: 无 diff -Nru ukui-sidebar-4.10.3.5/debian/patches/0042-update-changelog-for-4.10.3.5-ok0.9.patch ukui-sidebar-4.10.3.5/debian/patches/0042-update-changelog-for-4.10.3.5-ok0.9.patch --- ukui-sidebar-4.10.3.5/debian/patches/0042-update-changelog-for-4.10.3.5-ok0.9.patch 1970-01-01 08:00:00.000000000 +0800 +++ ukui-sidebar-4.10.3.5/debian/patches/0042-update-changelog-for-4.10.3.5-ok0.9.patch 2025-02-13 09:43:44.000000000 +0800 @@ -0,0 +1,96 @@ +From: youdiansaodongxi <guojiaqi@kylinos.cn> +Date: Thu, 13 Feb 2025 09:49:30 +0800 +Subject: update changelog for: 4.10.3.5-ok0.9 + +--- + qml/PopupView.qml | 12 ++++++------ + src/windows/right-hand-gesture-view.cpp | 7 +++++-- + ukui-shortcut/shortcuts/volume-shortcut/volume-shortcut.cpp | 9 ++------- + 3 files changed, 13 insertions(+), 15 deletions(-) + +diff --git a/qml/PopupView.qml b/qml/PopupView.qml +index 588d865..8319934 100644 +--- a/qml/PopupView.qml ++++ b/qml/PopupView.qml +@@ -269,15 +269,15 @@ Flickable { + } + } + +- Column { ++ ColumnLayout { + id: foldingBar +- height: (repeaterPerApp.count > 1) ? childrenRect.height : 0 + width: itemWidth + property int barHeight: 8 ++ spacing: 0 + + Item { +- height: repeaterPerApp.count > 1 ? foldingBar.barHeight : 0 +- width: itemWidth ++ Layout.preferredHeight: repeaterPerApp.count > 1 ? foldingBar.barHeight : 0 ++ Layout.preferredWidth: itemWidth + clip: true + + UkuiItems.StyleBackground { +@@ -293,8 +293,8 @@ Flickable { + } + } + Item { +- height: repeaterPerApp.count > 2 ? foldingBar.barHeight : 0 +- width: itemWidth ++ Layout.preferredHeight: repeaterPerApp.count > 2 ? foldingBar.barHeight : 0 ++ Layout.preferredWidth: itemWidth + clip: true + + UkuiItems.StyleBackground { +diff --git a/src/windows/right-hand-gesture-view.cpp b/src/windows/right-hand-gesture-view.cpp +index e1218a3..01ee9bc 100644 +--- a/src/windows/right-hand-gesture-view.cpp ++++ b/src/windows/right-hand-gesture-view.cpp +@@ -22,6 +22,7 @@ + #include "sidebar-window-helper.h" + #include "hand-gesture-helper.h" + #include "global-settings.h" ++#include "settings.h" + + namespace Sidebar { + +@@ -30,9 +31,11 @@ RightHandGestureView::RightHandGestureView(QWindow *parent) : SharedEngineView(p + setColor("transparent"); + setResizeMode(SharedEngineView::SizeRootObjectToView); + +- setFlags(Qt::FramelessWindowHint); ++ setFlags(Qt::WindowDoesNotAcceptFocus | Qt::FramelessWindowHint); + m_windowProxy = new UkuiQuick::WindowProxy2(this); +- m_windowProxy->setWindowType(UkuiQuick::WindowType::Switcher); ++ ++ m_windowProxy->setWindowType(UkuiQuick::Settings::instance()->platformName() == "wayland" ? ++ UkuiQuick::WindowType::Switcher : UkuiQuick::WindowType::SystemWindow); + + updateGeometry(); + connect(SidebarWindowHelper::instance(), &SidebarWindowHelper::geometryChanged, this, &RightHandGestureView::updateGeometry); +diff --git a/ukui-shortcut/shortcuts/volume-shortcut/volume-shortcut.cpp b/ukui-shortcut/shortcuts/volume-shortcut/volume-shortcut.cpp +index a0d88e6..5936993 100644 +--- a/ukui-shortcut/shortcuts/volume-shortcut/volume-shortcut.cpp ++++ b/ukui-shortcut/shortcuts/volume-shortcut/volume-shortcut.cpp +@@ -187,18 +187,13 @@ void VolumeShortcut::initMetaData() + void VolumeShortcut::mute(bool mute) + { + m_mute = mute; +- if (mute) { +- m_currentStatusInfo.setIcon(AUDIO_VOLUME_MUTED_SYMBOLIC); +- Q_EMIT statusChanged(m_currentStatusInfo); +- } else { +- updateStatus(m_currentStatusInfo.getValue()); +- } ++ updateStatus(m_currentStatusInfo.getValue()); + } + + void VolumeShortcut::updateStatus(int volume) + { + if(0 <= volume && volume <= 100) { +- if(volume == 0) { ++ if(volume == 0 || m_mute) { + m_currentStatusInfo.setIcon(AUDIO_VOLUME_MUTED_SYMBOLIC); + } else if (volume <= 33) { + m_currentStatusInfo.setIcon(AUDIO_VOLUME_LOW_SYMBOLIC); diff -Nru ukui-sidebar-4.10.3.5/debian/patches/series ukui-sidebar-4.10.3.5/debian/patches/series --- ukui-sidebar-4.10.3.5/debian/patches/series 2025-01-08 10:02:09.000000000 +0800 +++ ukui-sidebar-4.10.3.5/debian/patches/series 2025-02-13 09:43:44.000000000 +0800 @@ -39,3 +39,4 @@ 0039-update-changelog-for-4.10.3.5-ok0.6.patch 0040-update-changelog-for-4.10.3.5-ok0.7.patch 0041-update-changelog-for-4.10.3.5-ok0.8.patch +0042-update-changelog-for-4.10.3.5-ok0.9.patch