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

!62 [sync] PR-59: add fix-search-widget-display-error.patch

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
This commit is contained in:
openeuler-ci-bot 2024-11-20 05:47:10 +00:00 committed by Gitee
commit ed62ec9256
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fix-search-widget-display-error.patch Normal file
View File

@ -0,0 +1,32 @@
diff -Naur ukui-system-monitor-3.1.2/src/krightwidget.cpp ukui-system-monitor-3.1.2~/src/krightwidget.cpp
--- ukui-system-monitor-3.1.2/src/krightwidget.cpp 2022-02-21 09:12:09.000000000 +0800
+++ ukui-system-monitor-3.1.2~/src/krightwidget.cpp 2024-05-09 17:26:47.485293509 +0800
@@ -408,24 +408,21 @@
m_animationSearch->setEndValue(m_rectSeachAnimationEnd);
m_animationSearch->setEasingCurve(QEasingCurve::OutQuad);
m_animationSearch->start();
+ m_queryWid->layout()->removeWidget(m_queryText);
+ m_searchEditNew->setTextMargins(30,1,0,1);
} else {
m_queryText->adjustSize();
m_animationSearch->setStartValue(m_rectSeachAnimationEnd);
m_animationSearch->setEndValue(m_rectSeachAnimationBegin);
m_animationSearch->setEasingCurve(QEasingCurve::InQuad);
m_animationSearch->start();
+ m_queryWid->layout()->addWidget(m_queryText);
}
}
void KRightWidget::animationFinishedSlot()
{
- if(m_queryText->parent() == m_queryWid) {
- m_queryWid->layout()->removeWidget(m_queryText);
- m_queryText->setParent(nullptr);
- m_searchEditNew->setTextMargins(30,1,0,1);
- } else {
- m_queryWid->layout()->addWidget(m_queryText);
- }
+
}
void KRightWidget::onRefreshSearchResult()

7
ukui-system-monitor.spec
View File

@ -1,12 +1,13 @@
Name: ukui-system-monitor Name: ukui-system-monitor
Version: 3.1.2 Version: 3.1.2
Release: 3 Release: 4
Summary: Monitor for UKUI desktop environment Summary: Monitor for UKUI desktop environment
License: GPL-3+ and GPL-2+ License: GPL-3+ and GPL-2+
URL: http://www.ukui.org URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
Patch01: 0001-modify-version-is-pull.patch Patch01: 0001-modify-version-is-pull.patch
Patch02: 0001-fix-compile-error-of-ukui-system-monitor.patch Patch02: 0001-fix-compile-error-of-ukui-system-monitor.patch
Patch03: fix-search-widget-display-error.patch
BuildRequires: qt5-qtbase-devel >= 5.1 BuildRequires: qt5-qtbase-devel >= 5.1
BuildRequires: qt5-qtsvg-devel BuildRequires: qt5-qtsvg-devel
@ -36,6 +37,7 @@ Requires: glib2-devel
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
%build %build
export PATH=%{_qt5_bindir}:$PATH export PATH=%{_qt5_bindir}:$PATH
@ -69,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/ukui-system-monitor/translations/* %{_datadir}/ukui-system-monitor/translations/*
%changelog %changelog
* Thu May 09 2024 douyan <douyan@kylinos.cn> - 3.1.2-4
- add fix-search-widget-display-error.patch
* Thu Mar 02 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.2-3 * Thu Mar 02 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.2-3
- add file kylin-system-monitor for kylin-user-guide - add file kylin-system-monitor for kylin-user-guide