diff --git a/fix-search-widget-display-error.patch b/fix-search-widget-display-error.patch new file mode 100644 index 0000000..cc5d6b8 --- /dev/null +++ b/fix-search-widget-display-error.patch @@ -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() diff --git a/ukui-system-monitor.spec b/ukui-system-monitor.spec index 299b576..421887d 100644 --- a/ukui-system-monitor.spec +++ b/ukui-system-monitor.spec @@ -1,12 +1,13 @@ Name: ukui-system-monitor Version: 3.1.2 -Release: 3 +Release: 4 Summary: Monitor for UKUI desktop environment License: GPL-3+ and GPL-2+ URL: http://www.ukui.org Source0: %{name}-%{version}.tar.gz Patch01: 0001-modify-version-is-pull.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-qtsvg-devel @@ -36,6 +37,7 @@ Requires: glib2-devel %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build export PATH=%{_qt5_bindir}:$PATH @@ -69,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ukui-system-monitor/translations/* %changelog +* Thu May 09 2024 douyan - 3.1.2-4 +- add fix-search-widget-display-error.patch + * Thu Mar 02 2023 peijiankang - 3.1.2-3 - add file kylin-system-monitor for kylin-user-guide