virtual keyboard improvements

This commit is contained in:
Uwe Rathmann 2018-04-04 10:15:59 +02:00
parent 777a134645
commit 12a938e653
2 changed files with 7 additions and 4 deletions

View File

@ -253,7 +253,7 @@ void QskModule::registerTypes()
QSK_REGISTER( QskControl, "Control" ); QSK_REGISTER( QskControl, "Control" );
QSK_REGISTER( QskGraphicLabel, "GraphicLabel" ); QSK_REGISTER( QskGraphicLabel, "GraphicLabel" );
QSK_REGISTER( QskVirtualKeyboard, "InputPanel" ); QSK_REGISTER( QskVirtualKeyboard, "VirtualKeyboard" );
QSK_REGISTER( QskTextLabel, "TextLabel" ); QSK_REGISTER( QskTextLabel, "TextLabel" );
QSK_REGISTER( QskTabButton, "TabButton" ); QSK_REGISTER( QskTabButton, "TabButton" );
QSK_REGISTER( QskTabBar, "TabBar" ); QSK_REGISTER( QskTabBar, "TabBar" );

View File

@ -132,6 +132,11 @@ static bool qskIsAutorepeat( int key )
&& key != Qt::Key_Mode_switch ); && key != Qt::Key_Mode_switch );
} }
static inline QPlatformInputContext* qskInputContext()
{
return QGuiApplicationPrivate::platformIntegration()->inputContext();
}
QSK_SUBCONTROL( QskVirtualKeyboardCandidateButton, Panel ) QSK_SUBCONTROL( QskVirtualKeyboardCandidateButton, Panel )
QSK_SUBCONTROL( QskVirtualKeyboardCandidateButton, Text ) QSK_SUBCONTROL( QskVirtualKeyboardCandidateButton, Text )
@ -930,9 +935,7 @@ bool QskVirtualKeyboard::eventFilter( QObject* object, QEvent* event )
So we have to fix the receiver. So we have to fix the receiver.
*/ */
const auto platformIntegration = QGuiApplicationPrivate::platformIntegration(); if ( const auto inputContext = qskInputContext() )
if ( const auto inputContext = platformIntegration->inputContext() )
{ {
QQuickItem* item = nullptr; QQuickItem* item = nullptr;