From 16575180a30dff89d66c01fbef2dc44eb81fb698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=95=8F?= Date: Thu, 31 Oct 2024 07:46:01 +0000 Subject: [PATCH] =?UTF-8?q?!105=20=E4=BF=AE=E5=A4=8D=E9=94=81=E5=B1=8F?= =?UTF-8?q?=E6=97=B6=E4=B8=A4=E6=AC=A1=E8=B0=83=E7=94=A8blockGlobalShortcu?= =?UTF-8?q?ts=E7=9A=84=E9=97=AE=E9=A2=98=20Merge=20pull=20request=20!105?= =?UTF-8?q?=20from=20liudunfa/openkylin/nile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0068-105-blockGlobalShortcuts.patch | 40 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 41 insertions(+) create mode 100644 debian/patches/0068-105-blockGlobalShortcuts.patch diff --git a/debian/patches/0068-105-blockGlobalShortcuts.patch b/debian/patches/0068-105-blockGlobalShortcuts.patch new file mode 100644 index 0000000..b36a92a --- /dev/null +++ b/debian/patches/0068-105-blockGlobalShortcuts.patch @@ -0,0 +1,40 @@ +From: =?utf-8?b?5p2o5pWP?= +Date: Thu, 31 Oct 2024 07:46:01 +0000 +Subject: =?utf-8?b?ITEwNSDkv67lpI3plIHlsY/ml7bkuKTmrKHosIPnlKhibG9ja0dsb2Jh?= + =?utf-8?b?bFNob3J0Y3V0c+eahOmXrumimCBNZXJnZSBwdWxsIHJlcXVlc3QgITEwNSBmcm9t?= + =?utf-8?b?IGxpdWR1bmZhL29wZW5reWxpbi9uaWxl?= + +--- + src/lock-backend/dbusupperinterface.cpp | 6 +++++- + src/lock-backend/dbusupperinterface.h | 1 + + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/lock-backend/dbusupperinterface.cpp b/src/lock-backend/dbusupperinterface.cpp +index 90dac4f..940d699 100644 +--- a/src/lock-backend/dbusupperinterface.cpp ++++ b/src/lock-backend/dbusupperinterface.cpp +@@ -623,7 +623,11 @@ void DbusUpperInterface::emitLockState(bool val) + { + qDebug() << "emitLockState state = " << val; + +- m_kglobalHelper->blockShortcut(val); ++ if (val != m_bBlockShortcutState) { ++ m_kglobalHelper->blockShortcut(val); ++ m_bBlockShortcutState = val; ++ qDebug() << " block all shortcut " << "blockShortcut states = " << m_bBlockShortcutState; ++ } + + QDBusMessage message; + if (val) { +diff --git a/src/lock-backend/dbusupperinterface.h b/src/lock-backend/dbusupperinterface.h +index 6070942..67302bb 100644 +--- a/src/lock-backend/dbusupperinterface.h ++++ b/src/lock-backend/dbusupperinterface.h +@@ -428,6 +428,7 @@ private: + QByteArray pubKey, priKey; + KglobalAccelHelper *m_kglobalHelper = nullptr; + LibinputSwitchEvent *m_libinputSwitchEvent = nullptr; ++ bool m_bBlockShortcutState = false; + }; + + #endif // DBUSUPPERINTERFACE_H diff --git a/debian/patches/series b/debian/patches/series index 4bdc565..9a8f1e1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -65,3 +65,4 @@ 0065-102-fixbug.patch 0066-103-fixbug.patch 0067-104-fixbug.patch +0068-105-blockGlobalShortcuts.patch