From f0283207a1e955d9037d76d9ed2abd98815abc51 Mon Sep 17 00:00:00 2001 From: luoqing Date: Mon, 23 Oct 2023 09:57:27 +0800 Subject: [PATCH] fix(tray):Fixed a flash issue when the tray position changed from bottom to top, the first time to click the tray, the page display position is not correct, resulting in a flash issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复托盘位置由底部变为顶部时，第一次点击托盘，页面显示位置不对，导致的闪现问题 --- ...-Fixed-a-flash-issue-when-the-tray-p.patch | 30 +++++++++++++++++++ kiran-control-panel.spec | 6 +++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0017-fix-network-tray-Fixed-a-flash-issue-when-the-tray-p.patch diff --git a/0017-fix-network-tray-Fixed-a-flash-issue-when-the-tray-p.patch b/0017-fix-network-tray-Fixed-a-flash-issue-when-the-tray-p.patch new file mode 100644 index 0000000..5aef0e5 --- /dev/null +++ b/0017-fix-network-tray-Fixed-a-flash-issue-when-the-tray-p.patch @@ -0,0 +1,30 @@ +From e21e0b228328722ded74ffa92668338544d9c0cd Mon Sep 17 00:00:00 2001 +From: luoqing +Date: Thu, 19 Oct 2023 13:59:27 +0800 +Subject: [PATCH 2/2] fix(network-tray):Fixed a flash issue when the tray + position changed from bottom to top, the first time to click the tray, the + page display position is not correct, resulting in a flash issue +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 修复托盘位置由底部变为顶部时，第一次点击托盘，页面显示位置不对，导致的闪现问题 +--- + plugins/network/src/tray/network-tray.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/plugins/network/src/tray/network-tray.cpp b/plugins/network/src/tray/network-tray.cpp +index c43d8ff..9834a0e 100644 +--- a/plugins/network/src/tray/network-tray.cpp ++++ b/plugins/network/src/tray/network-tray.cpp +@@ -282,6 +282,7 @@ void NetworkTray::showOrHideTrayPage() + this->hide(); + else + { ++ setTrayPagePos(); + // XXX:托盘界面在不可见的情况，不方便去修改size和位置，暂时先显示后在调整大小和位置 + // this->setFixedSize(258, 258); + this->show(); +-- +2.33.0 + diff --git a/kiran-control-panel.spec b/kiran-control-panel.spec index 33f1ff0..9c3c36a 100644 --- a/kiran-control-panel.spec +++ b/kiran-control-panel.spec @@ -1,6 +1,6 @@ Name: kiran-control-panel Version: 2.5.5 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Kiran Control Panel Summary(zh_CN): Kiran桌面控制面板 @@ -23,6 +23,7 @@ Patch0013: 0013-fix-network-Modify-DNS-Settings-and-display-DNS-deta.patch Patch0014: 0014-fix-tray-Fixed-the-tray-menu-using-the-X11-platform-.patch Patch0015: 0015-fix-network-tray-Fixed-an-issue-where-the-size-Setti.patch Patch0016: 0016-fix-tray-Fixed-an-issue-where-the-popup-was-in-the-w.patch +Patch0017: 0017-fix-network-tray-Fixed-a-flash-issue-when-the-tray-p.patch BuildRequires: gcc-c++ BuildRequires: cmake >= 3.2 @@ -180,6 +181,9 @@ make %{?_smp_mflags} rm -rf %{buildroot} %changelog +* Mon Oct 23 2023 luoqing - 2.5.5-13 +- KYOS-F: Fixed a flash issue when the tray position changed from bottom to top, the first time to click the tray, the page display position is not correct, resulting in a flash issue + * Tue Oct 17 2023 luoqing - 2.5.5-12 - KYOS-F: Fixed an issue where the popup was in the wrong position when the tray was at the top of the screen (#17279) -- Gitee