From 12a938e653c3e5b2aefce8f2a07fcffd3d0a80b3 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Wed, 4 Apr 2018 10:15:59 +0200 Subject: [PATCH] virtual keyboard improvements --- src/common/QskModule.cpp | 2 +- src/controls/QskVirtualKeyboard.cpp | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/common/QskModule.cpp b/src/common/QskModule.cpp index 35f4fb22..1a3b0b85 100644 --- a/src/common/QskModule.cpp +++ b/src/common/QskModule.cpp @@ -253,7 +253,7 @@ void QskModule::registerTypes() QSK_REGISTER( QskControl, "Control" ); QSK_REGISTER( QskGraphicLabel, "GraphicLabel" ); - QSK_REGISTER( QskVirtualKeyboard, "InputPanel" ); + QSK_REGISTER( QskVirtualKeyboard, "VirtualKeyboard" ); QSK_REGISTER( QskTextLabel, "TextLabel" ); QSK_REGISTER( QskTabButton, "TabButton" ); QSK_REGISTER( QskTabBar, "TabBar" ); diff --git a/src/controls/QskVirtualKeyboard.cpp b/src/controls/QskVirtualKeyboard.cpp index cd4d6c4f..97366dfd 100644 --- a/src/controls/QskVirtualKeyboard.cpp +++ b/src/controls/QskVirtualKeyboard.cpp @@ -132,6 +132,11 @@ static bool qskIsAutorepeat( int key ) && key != Qt::Key_Mode_switch ); } +static inline QPlatformInputContext* qskInputContext() +{ + return QGuiApplicationPrivate::platformIntegration()->inputContext(); +} + QSK_SUBCONTROL( QskVirtualKeyboardCandidateButton, Panel ) QSK_SUBCONTROL( QskVirtualKeyboardCandidateButton, Text ) @@ -930,9 +935,7 @@ bool QskVirtualKeyboard::eventFilter( QObject* object, QEvent* event ) So we have to fix the receiver. */ - const auto platformIntegration = QGuiApplicationPrivate::platformIntegration(); - - if ( const auto inputContext = platformIntegration->inputContext() ) + if ( const auto inputContext = qskInputContext() ) { QQuickItem* item = nullptr;