|
 |
e1c9ed |
From 75693b47dcac101f74f98e5902c4c6b39d407e4f Mon Sep 17 00:00:00 2001
|
|
|
de89c0 |
From: David Redondo <qt@david-redondo.de>
|
|
|
de89c0 |
Date: Wed, 26 May 2021 14:49:40 +0200
|
|
|
e1c9ed |
Subject: [PATCH 15/40] Hook up queryKeyboardModifers
|
|
|
de89c0 |
|
|
|
de89c0 |
Can be useful when upon enter a modifiers event is received but no key
|
|
|
de89c0 |
event so no QKeyEvent is generated.
|
|
|
de89c0 |
|
|
|
de89c0 |
Fixes: QTBUG-62786
|
|
|
de89c0 |
Change-Id: I30b57fc78ce6d54d8f644ca95ba40e7e26eb24ed
|
|
|
de89c0 |
Reviewed-by: Marco Martin <mart@kde.org>
|
|
|
de89c0 |
Reviewed-by: David Edmundson <davidedmundson@kde.org>
|
|
|
de89c0 |
|
|
|
de89c0 |
|
|
|
de89c0 |
(cherry picked from commit 4fa2baba8181ade4958a94e9531ec4f6919438a9)
|
|
|
de89c0 |
---
|
|
|
de89c0 |
src/client/qwaylandintegration.cpp | 8 ++++++++
|
|
|
de89c0 |
src/client/qwaylandintegration_p.h | 2 ++
|
|
|
de89c0 |
2 files changed, 10 insertions(+)
|
|
|
de89c0 |
|
|
|
de89c0 |
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
|
|
|
de89c0 |
index c53ccb78..e5e7dd42 100644
|
|
|
de89c0 |
--- a/src/client/qwaylandintegration.cpp
|
|
|
de89c0 |
+++ b/src/client/qwaylandintegration.cpp
|
|
|
de89c0 |
@@ -262,6 +262,14 @@ QWaylandDisplay *QWaylandIntegration::display() const
|
|
|
de89c0 |
return mDisplay.data();
|
|
|
de89c0 |
}
|
|
|
de89c0 |
|
|
|
de89c0 |
+Qt::KeyboardModifiers QWaylandIntegration::queryKeyboardModifiers() const
|
|
|
de89c0 |
+{
|
|
|
de89c0 |
+ if (auto *seat = mDisplay->currentInputDevice()) {
|
|
|
de89c0 |
+ return seat->modifiers();
|
|
|
de89c0 |
+ }
|
|
|
de89c0 |
+ return Qt::NoModifier;
|
|
|
de89c0 |
+}
|
|
|
de89c0 |
+
|
|
|
de89c0 |
QList<int> QWaylandIntegration::possibleKeys(const QKeyEvent *event) const
|
|
|
de89c0 |
{
|
|
|
de89c0 |
if (auto *seat = mDisplay->currentInputDevice())
|
|
|
de89c0 |
diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h
|
|
|
de89c0 |
index ff70ae25..73b80658 100644
|
|
|
de89c0 |
--- a/src/client/qwaylandintegration_p.h
|
|
|
de89c0 |
+++ b/src/client/qwaylandintegration_p.h
|
|
|
de89c0 |
@@ -107,6 +107,8 @@ public:
|
|
|
de89c0 |
|
|
|
de89c0 |
QWaylandDisplay *display() const;
|
|
|
de89c0 |
|
|
|
de89c0 |
+ Qt::KeyboardModifiers queryKeyboardModifiers() const override;
|
|
|
de89c0 |
+
|
|
|
de89c0 |
QList<int> possibleKeys(const QKeyEvent *event) const override;
|
|
|
de89c0 |
|
|
|
de89c0 |
QStringList themeNames() const override;
|
|
|
de89c0 |
--
|
|
|
e1c9ed |
2.35.1
|
|
|
de89c0 |
|