packages/ukui-panel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to version 3.0.2

Browse Source
This commit is contained in:
dou33 2020-11-03 14:14:45 +08:00
parent a60ff3cc44
commit bd6e39ff3c
5 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fix-panel-taskview-icon.patch
View File

@ -1,13 +0,0 @@
diff -ur ukui-panel-2.0.8/plugin-taskview/taskview.cpp ukui-panel-2.0.8~/plugin-taskview/taskview.cpp
--- ukui-panel-2.0.8/plugin-taskview/taskview.cpp 2020-06-22 15:53:13.000000000 +0800
+++ ukui-panel-2.0.8~/plugin-taskview/taskview.cpp 2020-06-28 14:10:34.000000000 +0800
@@ -44,7 +44,8 @@
{
mButton =new TaskViewButton();
mButton->setStyle(new CustomStyle());
- mButton->setIcon(QIcon::fromTheme("taskview",QIcon("/usr/share/ukui-panel/panel/img/taskview.svg")));
+ //mButton->setIcon(QIcon::fromTheme("taskview",QIcon("/usr/share/ukui-panel/panel/img/taskview.svg")));
+ mButton->setIcon(QIcon::fromTheme("taskview"));
mButton->setToolTip(tr("Show Taskview"));
/* hide/show taskview

24
fix-taskbar-compile-issue.patch Normal file
View File

@ -0,0 +1,24 @@
diff -ur ukui-panel-3.0.3/plugin-taskbar/ukuitaskwidget.cpp ukui-panel-3.0.3~/plugin-taskbar/ukuitaskwidget.cpp
--- ukui-panel-3.0.3/plugin-taskbar/ukuitaskwidget.cpp 2020-09-28 10:40:15.000000000 +0800
+++ ukui-panel-3.0.3~/plugin-taskbar/ukuitaskwidget.cpp 2020-10-26 15:46:58.146651735 +0800
@@ -592,7 +590,8 @@
{
// return KWindowInfo(mWindow,NET::WMState | NET::XAWMState).isMinimized();
#if (QT_VERSION >= QT_VERSION_CHECK(5,7,0))
- return NET::Focused == (KWindowInfo(mWindow,NET::WMState).state()&NET::Focused);
+ // return NET::Focused == (KWindowInfo(mWindow,NET::WMState).state()&NET::Focused);
+ return isApplicationActive();
#else
return isApplicationActive();
#endif
@@ -602,7 +601,8 @@
{
qDebug()<<"KWindowInfo(mWindow,NET::WMState).state():"<<KWindowInfo(mWindow,NET::WMState).state();
#if (QT_VERSION >= QT_VERSION_CHECK(5,7,0))
- return NET::Focused == (KWindowInfo(mWindow,NET::WMState).state()&NET::Focused);
+ //return NET::Focused == (KWindowInfo(mWindow,NET::WMState).state()&NET::Focused);
+ return isApplicationActive();
#else
return isApplicationActive();
#endif

BIN
ukui-panel-2.0.8.tar.gz
View File

Binary file not shown.

BIN
ukui-panel-3.0.2.tar.gz Normal file
View File

Binary file not shown.

11
ukui-panel.spec
View File

@ -1,10 +1,10 @@
%define debug_package %{nil}
Name: ukui-panel
Version: 2.0.8
Version: 3.0.2
Release: 1
Summary: ukui desktop panel
License: LGPL-2.1+ GPL-2+
License: LGPL-2.1+ GPL-2+ LGPL-3
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz
@ -41,7 +41,8 @@ BuildRequires: libpeony-dev
BuildRequires: dconf-devel
BuildRequires: libpeony-dev
patch0: fix-panel-taskview-icon.patch
#patch0: fix-panel-taskview-icon.patch
patch0: fix-taskbar-compile-issue.patch
Provides: ukui-indicators
@ -53,6 +54,7 @@ Provides: ukui-indicators
%prep
%setup -q
#%%patch0 -p1
%patch0 -p1
%build
@ -76,5 +78,8 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/*
%changelog
* Mon Oct 26 2020 douyan <douyan@kylinos.cn> - 3.0.2-1
- update to upstream version 3.0.1-1+1028
* Thu Jul 9 2020 douyan <douyan@kylinos.cn> - 2.0.8-1
- Init package for openEuler