!8 fix calendar

From: @myshow2258
Reviewed-by: @dou33
Signed-off-by: @dou33
This commit is contained in:
openeuler-ci-bot 2020-12-04 12:58:18 +08:00 committed by Gitee
commit 96e717625d
3 changed files with 10 additions and 37 deletions

View File

@ -1,24 +0,0 @@
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

Binary file not shown.

View File

@ -2,13 +2,12 @@
Name: ukui-panel Name: ukui-panel
Version: 3.0.2 Version: 3.0.2
Release: 2 Release: 3
Summary: ukui desktop panel Summary: ukui desktop panel
License: LGPL-2.1+ GPL-2+ LGPL-3 License: LGPL-2.1+ GPL-2+ LGPL-3
URL: http://www.ukui.org URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
BuildRequires: cmake BuildRequires: cmake
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
BuildRequires: dbusmenu-qt5-devel BuildRequires: dbusmenu-qt5-devel
@ -41,21 +40,16 @@ BuildRequires: libpeony-dev
BuildRequires: dconf-devel BuildRequires: dconf-devel
BuildRequires: libpeony-dev BuildRequires: libpeony-dev
#patch0: fix-panel-taskview-icon.patch
patch0: fix-taskbar-compile-issue.patch
Provides: ukui-indicators Provides: ukui-indicators
%description %description
The ukui desktop panel is used on ukui desktop and has some plugins like The ukui desktop panel is used on ukui desktop and has some plugins like
starmenu, quicklaunch and other useful tools. starmenu, quicklaunch and other useful tools.
.
This package contains the ukui panel. This package contains the ukui panel.
%prep %prep
%setup -q %setup -q
#%%patch0 -p1 #%patch0 -p1
%patch0 -p1
%build %build
mkdir build && cd build mkdir build && cd build
@ -78,7 +72,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/* %{_datadir}/*
%changelog %changelog
* Wen Dec 26 2020 douyan <douyan@kylinos.cn> - 3.0.2-2 * Fri Dec 4 2020 lvhan <lvhan@kylinos.cn> - 3.0.2-3
- fix calendar
* Thu Dec 3 2020 douyan <douyan@kylinos.cn> - 3.0.2-2
- block calendar - block calendar
* Mon Oct 26 2020 douyan <douyan@kylinos.cn> - 3.0.2-1 * Mon Oct 26 2020 douyan <douyan@kylinos.cn> - 3.0.2-1