!9 block-taskbar-right-click

From: @myshow2258
Reviewed-by: @dou33
Signed-off-by: @dou33
This commit is contained in:
openeuler-ci-bot 2020-12-05 10:26:55 +08:00 committed by Gitee
commit 57a821d835
2 changed files with 39 additions and 2 deletions

View File

@ -0,0 +1,32 @@
From 6fac1af7e08ce92384035f29d19141e5c79aa141 Mon Sep 17 00:00:00 2001
From: myshow <296570182@qq.com>
Date: Fri, 4 Dec 2020 17:52:24 +0800
Subject: [PATCH] block-taskbar-right-click
---
plugin-taskbar/ukuitaskwidget.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/plugin-taskbar/ukuitaskwidget.cpp b/plugin-taskbar/ukuitaskwidget.cpp
index 2481fc4..b463f54 100644
--- a/plugin-taskbar/ukuitaskwidget.cpp
+++ b/plugin-taskbar/ukuitaskwidget.cpp
@@ -358,6 +358,7 @@ void UKUITaskWidget::closeGroup() {
void UKUITaskWidget::contextMenuEvent(QContextMenuEvent *event)
{
+ /*
QMenu * menu = new QMenu(tr("Widget"));
menu->setAttribute(Qt::WA_DeleteOnClose);
QAction *close = menu->addAction(QIcon::fromTheme("window-close-symbolic"), tr("close"));
@@ -377,6 +378,7 @@ void UKUITaskWidget::contextMenuEvent(QContextMenuEvent *event)
menu->setGeometry(plugin()->panel()->calculatePopupWindowPos(mapToGlobal(event->pos()), menu->sizeHint()));
plugin()->willShowWindow(menu);
menu->show();
+ */
}
/************************************************
--
2.29.2.windows.2

View File

@ -2,7 +2,7 @@
Name: ukui-panel
Version: 3.0.2
Release: 3
Release: 4
Summary: ukui desktop panel
License: LGPL-2.1+ GPL-2+ LGPL-3
URL: http://www.ukui.org
@ -42,6 +42,8 @@ BuildRequires: libpeony-dev
Provides: ukui-indicators
patch0: 0001-block-taskbar-right-click.patch
%description
The ukui desktop panel is used on ukui desktop and has some plugins like
starmenu, quicklaunch and other useful tools.
@ -49,7 +51,7 @@ Provides: ukui-indicators
%prep
%setup -q
#%patch0 -p1
%patch0 -p1
%build
mkdir build && cd build
@ -72,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/*
%changelog
* Fri Dec 4 2020 lvhan <lvhan@kylinos.cn> - 3.0.2-4
- block taskbar right click
* Fri Dec 4 2020 lvhan <lvhan@kylinos.cn> - 3.0.2-3
- fix calendar