From 84502e80a319820ad3020f1c8faeac9bcd3e61b3 Mon Sep 17 00:00:00 2001
From: huayadong <huayadong@kylinos.cn>
Date: Thu, 15 Aug 2024 16:32:21 +0800
Subject: [PATCH] fix the display resolution does not match the actual
 resolution

---
 ...does-not-match-the-actual-resolution.patch | 26 +++++++++++++++++++
 ukui-control-center.spec                      |  9 ++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 fix-the-display-resolution-does-not-match-the-actual-resolution.patch

diff --git a/fix-the-display-resolution-does-not-match-the-actual-resolution.patch b/fix-the-display-resolution-does-not-match-the-actual-resolution.patch
new file mode 100644
index 0000000..adbcb83
--- /dev/null
+++ b/fix-the-display-resolution-does-not-match-the-actual-resolution.patch
@@ -0,0 +1,26 @@
+From 154ef4cd4ba90888c467d00a91337764628538ca Mon Sep 17 00:00:00 2001
+From: huayadong <huayadong@kylinos.cn>
+Date: Tue, 4 Jun 2024 09:13:48 +0800
+Subject: [PATCH] 
+ fix-the-display-resolution-does-not-match-the-actual-resolution.patch
+
+---
+ plugins/system/display/outputconfig.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/system/display/outputconfig.cpp b/plugins/system/display/outputconfig.cpp
+index a25f215..601215c 100644
+--- a/plugins/system/display/outputconfig.cpp
++++ b/plugins/system/display/outputconfig.cpp
+@@ -231,7 +231,7 @@ void OutputConfig::initConnection()
+     });
+     //监听，否则无法处理修改分辨率/刷新率未保存
+     connect(mOutput.data(), &KScreen::Output::currentModeIdChanged, this, [=]() {
+-        if (!mIsRestore || !mOutput->currentMode()) {
++        if (!mOutput->currentMode()) {
+             mIsRestore = true;
+             return;
+         }
+-- 
+2.43.0
+
diff --git a/ukui-control-center.spec b/ukui-control-center.spec
index 3dcd7ba..e7ddcb4 100644
--- a/ukui-control-center.spec
+++ b/ukui-control-center.spec
@@ -1,6 +1,6 @@
 Name:           ukui-control-center
 Version:        3.1.2
-Release:        32
+Release:        33
 Summary:        utilities to configure the UKUI desktop
 License:        GPL-2+
 URL:            http://www.ukui.org
@@ -34,6 +34,7 @@ Patch28:	0001-fix-object-created-in-wrong-thread.patch
 Patch200:       fix-build-error-of-libkscreen-qt5-5.27.6.patch
 Patch201:       fix-build-error-of-clang.patch
 Patch202:       fix-build-error-of-ddcutil-2.0.0.patch
+Patch203:	fix-the-display-resolution-does-not-match-the-actual-resolution.patch
 BuildRequires: qt5-qtsvg-devel
 BuildRequires: gsettings-qt-devel
 BuildRequires: glib2-devel
@@ -152,6 +153,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 15 2024 huayadong <huayadong@kylinos.cn> - 3.1.2-33
+- Type:bugfix
+- ID  :NA
+- SUG :NA
+- DESC:Patch203:fix-the-display-resolution-does-not-match-the-actual-resolution.patch
+
 * Tue Jun 25 2024 houhongxun <houhongxun@kylinos.cn> - 3.1.2-32
 - fix wrong usage of qthread