From 694a00224561066ab1a47b74c39a18d7cc4d1bdc Mon Sep 17 00:00:00 2001 From: pei-jiankang Date: Thu, 31 Mar 2022 15:42:55 +0800 Subject: [PATCH] modify the button problem of ukui-panel --- ...ify-the-button-problem-of-ukui-panel.patch | 42 +++++++++++++++++++ ukui-panel.spec | 7 +++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 0005-modify-the-button-problem-of-ukui-panel.patch diff --git a/0005-modify-the-button-problem-of-ukui-panel.patch b/0005-modify-the-button-problem-of-ukui-panel.patch new file mode 100644 index 0000000..8ede3b4 --- /dev/null +++ b/0005-modify-the-button-problem-of-ukui-panel.patch @@ -0,0 +1,42 @@ +From 34e86cb6e9ec5fd0a30b1ce4fa985bd785b927e6 Mon Sep 17 00:00:00 2001 +From: pei-jiankang +Date: Thu, 31 Mar 2022 15:40:49 +0800 +Subject: [PATCH] modify the button problem of ukui-panel + +--- + plugin-statusnotifier/statusnotifierbutton.cpp | 6 ++++++ + plugin-statusnotifier/statusnotifierbutton.h | 1 + + 2 files changed, 7 insertions(+) + +diff --git a/plugin-statusnotifier/statusnotifierbutton.cpp b/plugin-statusnotifier/statusnotifierbutton.cpp +index 473ee0c..7fd5968 100644 +--- a/plugin-statusnotifier/statusnotifierbutton.cpp ++++ b/plugin-statusnotifier/statusnotifierbutton.cpp +@@ -359,6 +359,12 @@ void StatusNotifierButton::dragMoveEvent(QDragMoveEvent * e) + + } + ++void StatusNotifierButton::dragLeaveEvent(QDragLeaveEvent *e) ++{ ++ update(); //拖拽离开wigget时,需要updata ++ e->accept(); ++} ++ + void StatusNotifierButton::dragEnterEvent(QDragEnterEvent *e) + { + e->acceptProposedAction(); +diff --git a/plugin-statusnotifier/statusnotifierbutton.h b/plugin-statusnotifier/statusnotifierbutton.h +index b4d5b33..ee8433c 100644 +--- a/plugin-statusnotifier/statusnotifierbutton.h ++++ b/plugin-statusnotifier/statusnotifierbutton.h +@@ -105,6 +105,7 @@ protected: + void mouseReleaseEvent(QMouseEvent *event); + void wheelEvent(QWheelEvent *event); + void dragEnterEvent(QDragEnterEvent *e); ++ void dragLeaveEvent(QDragLeaveEvent *e); + void dragMoveEvent(QDragMoveEvent * e); + void mouseMoveEvent(QMouseEvent *e); + void mousePressEvent(QMouseEvent *e); +-- +2.33.0 + diff --git a/ukui-panel.spec b/ukui-panel.spec index edbc9ac..6f1c70d 100644 --- a/ukui-panel.spec +++ b/ukui-panel.spec @@ -2,7 +2,7 @@ Name: ukui-panel Version: 3.0.6 -Release: 7 +Release: 8 Summary: ukui desktop panel License: LGPL-2.1+ GPL-2+ LGPL-3 URL: http://www.ukui.org @@ -13,6 +13,7 @@ Patch1: 0001-modify-show-taskview-not-translation.patch Patch2: 0002-tran-to-zh_cn.patch Patch3: 0003-modify-close-ShowTaskview-no-replay.patch Patch4: 0004-modify-lunarcalendar-display-error.patch +Patch5: 0005-modify-the-button-problem-of-ukui-panel.patch BuildRequires: cmake BuildRequires: alsa-lib-devel @@ -66,6 +67,7 @@ Provides: ukui-indicators %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 cp -rf %{SOURCE1} %{_builddir}/%{name}-%{version}/panel/resources %build @@ -89,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/* %changelog +* Thu Mar 31 2022 pei-jiankang - 3.0.6-8 +- modify the button problem of ukui-panel + * Mon Mar 28 2022 pei-jiankang - 3.0.6-7 - modify lunarcalendar display error