From e2ca55819e80897ffcf908c754ae7e0811f27684 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Thu, 12 Apr 2018 13:32:28 +0200 Subject: [PATCH] locale updates fixed --- inputcontext/QskInputCompositionModel.cpp | 2 +- inputcontext/QskInputContext.cpp | 5 +++-- src/inputpanel/QskVirtualKeyboard.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/inputcontext/QskInputCompositionModel.cpp b/inputcontext/QskInputCompositionModel.cpp index ba6d76ea..741b4362 100644 --- a/inputcontext/QskInputCompositionModel.cpp +++ b/inputcontext/QskInputCompositionModel.cpp @@ -238,7 +238,7 @@ void QskInputCompositionModel::sendPreeditTextEvent( const QString& text ) const QInputMethodEvent::Attribute attribute( QInputMethodEvent::TextFormat, 0, text.length(), format ); - + QInputMethodEvent event( text, { attribute } ); context()->sendEventToInputItem( &event ); } diff --git a/inputcontext/QskInputContext.cpp b/inputcontext/QskInputContext.cpp index 743a9d7e..1036058c 100644 --- a/inputcontext/QskInputContext.cpp +++ b/inputcontext/QskInputContext.cpp @@ -89,7 +89,7 @@ public: QPointer< QQuickItem > inputItem; // item, wher the user enters texts/keys - QPointer< QQuickItem > inputPanel; + QPointer< QQuickItem > inputPanel; // popup or window embedding the inputPanel QskPopup* inputPopup = nullptr; @@ -352,6 +352,7 @@ void QskInputContext::showInputPanel() inputPopup->setVisible( true ); } + update( Qt::ImQueryAll ); inputPanel->setVisible( true ); connect( inputPanel->window(), &QskWindow::visibleChanged, @@ -631,7 +632,7 @@ bool QskInputContext::eventFilter( QObject* object, QEvent* event ) } else { - switch( static_cast( event->type() ) ) + switch( static_cast< int >( event->type() ) ) { case QskEvent::GeometryChange: { diff --git a/src/inputpanel/QskVirtualKeyboard.cpp b/src/inputpanel/QskVirtualKeyboard.cpp index e9b5d102..def17c35 100644 --- a/src/inputpanel/QskVirtualKeyboard.cpp +++ b/src/inputpanel/QskVirtualKeyboard.cpp @@ -288,7 +288,7 @@ qreal QskVirtualKeyboard::widthForHeight( qreal height ) const qreal width = height / ratio; width += margins.left() + margins.right(); - + return height; }