From a0995f6d72634f279059664fe5cb61879f96184b Mon Sep 17 00:00:00 2001
From: Peter Hartmann <peter.hartmann@intopalo.com>
Date: Wed, 14 Mar 2018 18:00:55 +0100
Subject: [PATCH] keyboard: fix cursor navigation and clean up the code a bit

---
 inputcontext/QskInputCompositionModel.cpp | 13 +++++--------
 inputcontext/QskInputContext.cpp          |  6 ++++--
 inputcontext/QskInputContext.h            |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/inputcontext/QskInputCompositionModel.cpp b/inputcontext/QskInputCompositionModel.cpp
index da956d5b..eed9c1bb 100644
--- a/inputcontext/QskInputCompositionModel.cpp
+++ b/inputcontext/QskInputCompositionModel.cpp
@@ -71,8 +71,7 @@ void QskInputCompositionModel::composeKey( Qt::Key key )
     if ( !inputMethod )
         return;
 
-    auto focusObject = QGuiApplication::focusObject();
-    if ( !focusObject )
+    if ( !m_data->inputItem )
         return;
 
     QInputMethodQueryEvent queryEvent(
@@ -224,8 +223,7 @@ void QskInputCompositionModel::commitCandidate( int index )
 
 void QskInputCompositionModel::backspace()
 {
-    auto focusWindow = QGuiApplication::focusWindow();
-    if ( !focusWindow )
+    if ( !m_data->inputItem )
         return;
 
     if ( !m_data->preedit.isEmpty() )
@@ -253,8 +251,7 @@ void QskInputCompositionModel::moveCursor( Qt::Key key )
     if ( key != Qt::Key_Left && key != Qt::Key_Right )
         return;
 
-    auto focusWindow = QGuiApplication::focusWindow();
-    if ( !focusWindow )
+    if ( !m_data->inputItem )
         return;
 
     // Moving cursor is disabled when preedit is active.
@@ -263,8 +260,8 @@ void QskInputCompositionModel::moveCursor( Qt::Key key )
 
     QKeyEvent moveCursorPress( QEvent::KeyPress, key, Qt::NoModifier );
     QKeyEvent moveCursorRelease( QEvent::KeyRelease, key,  Qt::NoModifier );
-    QCoreApplication::sendEvent( focusWindow, &moveCursorPress );
-    QCoreApplication::sendEvent( focusWindow, &moveCursorRelease );
+    QCoreApplication::sendEvent( m_data->inputItem, &moveCursorPress );
+    QCoreApplication::sendEvent( m_data->inputItem, &moveCursorRelease );
 }
 
 void QskInputCompositionModel::sendCompositionEvent( QInputMethodEvent* e )
diff --git a/inputcontext/QskInputContext.cpp b/inputcontext/QskInputContext.cpp
index 9f97057e..a95259eb 100644
--- a/inputcontext/QskInputContext.cpp
+++ b/inputcontext/QskInputContext.cpp
@@ -21,13 +21,15 @@
 #include <QRectF>
 
 QskInputContext::QskInputContext():
-    Inherited()
+    Inherited(),
+    m_inputCompositionModel( new QskInputCompositionModel )
 {
     connect( qskSetup, &QskSetup::inputPanelChanged,
         this, &QskInputContext::setInputPanel );
     setInputPanel( qskSetup->inputPanel() );
 
-    m_inputCompositionModel.reset( new QskInputCompositionModel );
+    // We could connect candidatesChanged() here, but we don't emit
+    // the signal in the normal composition model anyhow
 }
 
 QskInputContext::~QskInputContext()
diff --git a/inputcontext/QskInputContext.h b/inputcontext/QskInputContext.h
index 31a7c30d..85a852eb 100644
--- a/inputcontext/QskInputContext.h
+++ b/inputcontext/QskInputContext.h
@@ -23,7 +23,7 @@ class QskInputContext : public QPlatformInputContext
 
 public:
     QskInputContext();
-    ~QskInputContext();
+    ~QskInputContext() override;
 
     bool isValid() const override;
     void update( Qt::InputMethodQueries ) override;