!45 modify the button problem of ukui-panel

From: @pei-jiankang 
Reviewed-by: @dou33 
Signed-off-by: @dou33
This commit is contained in:
openeuler-ci-bot 2022-03-31 08:17:00 +00:00 committed by Gitee
commit 470d7f0095
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 48 additions and 1 deletions

View File

@ -0,0 +1,42 @@
From 34e86cb6e9ec5fd0a30b1ce4fa985bd785b927e6 Mon Sep 17 00:00:00 2001
From: pei-jiankang <peijiankang@kylinos.cn>
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

View File

@ -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 <peijiankang@kylinos.cn> - 3.0.6-8
- modify the button problem of ukui-panel
* Mon Mar 28 2022 pei-jiankang <peijiankang@kylinos.cn> - 3.0.6-7
- modify lunarcalendar display error