From 64529755b3849ba055dbb5b6a25cddec4ed04cb3 Mon Sep 17 00:00:00 2001
From: tanyulong2021 <tanyulong@kylinos.cn>
Date: Tue, 7 Dec 2021 15:44:36 +0800
Subject: [PATCH] reset win-key-release gsettings key value

---
 0006-ukui-session-session-application.patch | 28 +++++++++++++++++++++
 ukui-session-manager.spec                   |  7 +++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 0006-ukui-session-session-application.patch

diff --git a/0006-ukui-session-session-application.patch b/0006-ukui-session-session-application.patch
new file mode 100644
index 0000000..5cc1094
--- /dev/null
+++ b/0006-ukui-session-session-application.patch
@@ -0,0 +1,28 @@
+From 5d42662e88b950b69ca49f0ad79e813b8b0ecd23 Mon Sep 17 00:00:00 2001
+From: tanyulong <tanyulong@kylinos.cn>
+Date: Tue, 7 Dec 2021 15:34:59 +0800
+Subject: [PATCH] ukui-session/sessionapplication.cpp
+
+---
+ ukui-session/sessionapplication.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/ukui-session/sessionapplication.cpp b/ukui-session/sessionapplication.cpp
+index 5f6243c..1688c40 100755
+--- a/ukui-session/sessionapplication.cpp
++++ b/ukui-session/sessionapplication.cpp
+@@ -56,6 +56,11 @@ void SessionApplication::InitialEnvironment()
+ 	    gs->set("canhibernate",false);
+     }
+ 
++    //在打开关机管理界面后通过物理按键的方式关机/重启
++    //将导致win-key-release键值为true
++    //造成大部分热键和组合键失效
++    //所以在登录进来时恢复默认值
++    //gs->reset("win-key-release");
+     //检查qt主题是否安装
+     const QByteArray qt_style(QT5_UKUI_STYLE);
+     QByteArray QT_QPA_PLATFORMTHEME;
+-- 
+2.30.0
+
diff --git a/ukui-session-manager.spec b/ukui-session-manager.spec
index 7e2330b..d1455ff 100644
--- a/ukui-session-manager.spec
+++ b/ukui-session-manager.spec
@@ -2,7 +2,7 @@
 
 Name:           ukui-session-manager
 Version:        3.0.2
-Release:        6
+Release:        7
 Summary:    Session manager of the UKUI desktop environment
 License:         LGPL-2.1+ GPL-3+
 URL:            http://www.ukui.org
@@ -27,6 +27,7 @@ patch1: 0002-reset-changelog-and-format.patch
 patch2: 0003-adjust-the-sequence-to-make-translation-file-loaded-first.patch
 patch3: 0004-add-startlogout-signal.patch
 patch4: 0005-update-debian-changelog.patch
+patch5: 0006-ukui-session-session-application.patch
 
 %description
  This package contains a session that can be started from a display
@@ -41,6 +42,7 @@ patch4: 0005-update-debian-changelog.patch
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 mkdir cmake-build
@@ -74,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 #%%{_datadir}/man/man1/ukui-session-tools.1.gz
 
 %changelog
+* Tue Dec 07 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.2-7
+- add patch: 0006-ukui-session-session-application.patch
+
 * Thu Dec 02 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.2-6
 - update debian changelog