Merge branch 'freaksdd-main'

amarula · Sep 24, 2024 · 5af2d82 · 5af2d82
2 parents 53bdb0c + 7b96d76
commit 5af2d82
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 3 deletions.
diff --git a/src/DeclarativeInputEngine.cpp b/src/DeclarativeInputEngine.cpp
@@ -17,6 +17,7 @@ struct DeclarativeInputEnginePrivate {
     struct LayoutData {
         QString layoutFile;
         QString description;
+        QString spaceIdentifier = "Space";
     };
 
     DeclarativeInputEngine *_this;
@@ -32,7 +33,7 @@ struct DeclarativeInputEnginePrivate {
         {DeclarativeInputEngine::Fr, {"FrLayout", "Français"}},
         {DeclarativeInputEngine::It, {"ItLayout", "Italiano"}},
         {DeclarativeInputEngine::Es, {"EsLayout", "Español"}},
-        {DeclarativeInputEngine::De, {"DeLayout", "Deutsch"}},
+        {DeclarativeInputEngine::De, {"DeLayout", "Deutsch", "Leerzeichen"}},
         {DeclarativeInputEngine::Nl, {"NlLayout", "Nederlands"}},
         {DeclarativeInputEngine::Pt, {"PtLayout", "Português"}},
         {DeclarativeInputEngine::Cs, {"CsLayout", "Čeština"}},
@@ -165,3 +166,18 @@ QString DeclarativeInputEngine::descriptionOfLayout(QString layout) {
     }
     return d->layoutFiles.value(layoutVal, {}).description;
 }
+
+QString DeclarativeInputEngine::spaceIdentifierOfLayout(QString layout)
+{
+    if (!inputLayoutValid(layout)) {
+        return "";
+    }
+    bool ok = false;
+    auto layoutVal = static_cast<InputLayouts>(
+        QMetaEnum::fromType<InputLayouts>().keyToValue(layout.toUtf8().data(),
+                                                       &ok));
+    if (!ok) {
+        return "";
+    }
+    return d->layoutFiles.value(layoutVal, {}).spaceIdentifier;
+}
diff --git a/src/DeclarativeInputEngine.h b/src/DeclarativeInputEngine.h
@@ -117,11 +117,15 @@ class DeclarativeInputEngine : public QObject {
     Q_INVOKABLE QString fileOfLayout(QString layout);
 
     /**
-     * Use this function to get the correct layout file for each language
-     * (only needed for languages that share one file)
+     * Use this function to get the correct description for each language
      */
     Q_INVOKABLE QString descriptionOfLayout(QString layout);
 
+    /**
+     * Use this function to get the correct 'space'-identifier for each language
+     */
+    Q_INVOKABLE QString spaceIdentifierOfLayout(QString layout);
+
    public slots:
     /**
      * Emits a key click event for the given key, text and modifiers.

diff --git a/src/VirtualKeyboardInputContext.cpp b/src/VirtualKeyboardInputContext.cpp
@@ -3,6 +3,8 @@
 #include <private/qquickflickable_p.h>
 
 #include <QPropertyAnimation>
+#include <QtQuick/qquickitem.h>
+#include <QtQuick/qquickwindow.h>
 
 #include "DeclarativeInputEngine.h"
 #include "EnterKeyAction.hpp"
@@ -70,6 +72,14 @@ bool VirtualKeyboardInputContext::focusItemHasEnterKeyAction(
            qmlAttachedPropertiesObject<EnterKeyAction>(item, false);
 }
 
+void VirtualKeyboardInputContext::registerInputPanel(QObject *inputPanel)
+{
+    Q_ASSERT(!this->inputPanel);
+    this->inputPanel = inputPanel;
+    if (QQuickItem *item = qobject_cast<QQuickItem *>(inputPanel))
+        item->setZ(std::numeric_limits<qreal>::max());
+}
+
 bool VirtualKeyboardInputContext::isValid() const { return true; }
 
 QRectF VirtualKeyboardInputContext::keyboardRect() const { return QRectF(); }
@@ -108,9 +118,36 @@ void VirtualKeyboardInputContext::setFocusObject(QObject *object) {
 
     bool AcceptsInput = d->FocusItem->inputMethodQuery(Qt::ImEnabled).toBool();
     if (!AcceptsInput) {
+        hideInputPanel();
         return;
     }
 
+    // set the focusItem as parent of InputPanel
+    if (QObject *item = inputItem()) {
+        // ToDo: the InputPanel is set once, so cast can be done at register QQuickItem
+        if (QQuickItem *vkbPanel = qobject_cast<QQuickItem*>(inputPanel)) {
+            // ToDo: cast of inputItem is overflow ... use d->FocusItem
+            if (QQuickItem *quickItem = qobject_cast<QQuickItem*>(item)) {
+                const QVariant isRootItem = vkbPanel->property("__isRootItem");
+                /*
+                    For integrated keyboards, make sure it's a sibling to the overlay. The
+                    high z-order will make sure it gets events also during a modal session.
+                */
+                if (isRootItem.isValid() && !isRootItem.toBool()) {
+                    vkbPanel->setParentItem(quickItem->window()->contentItem());
+                    vkbPanel->setProperty("__reparented", true);
+                }
+            }
+        }
+    }
+
+    visibleConnection = std::make_shared<QMetaObject::Connection>(QObject::connect(d->FocusItem, &QQuickItem::visibleChanged, this, [&](){
+        if(!d->FocusItem->isVisible())
+            hideInputPanel();
+        else
+            showInputPanel();
+    }));
+
     emit inputItemChanged();
 
     Qt::InputMethodHints InputMethodHints(

diff --git a/src/VirtualKeyboardInputContext.h b/src/VirtualKeyboardInputContext.h
@@ -15,6 +15,8 @@
 #include <qpa/qplatforminputcontext.h>
 
 #include <QRectF>
+#include <QPointer>
+#include <memory.h>
 
 class QQmlEngine;
 class QJSEngine;
@@ -96,6 +98,12 @@ class VirtualKeyboardInputContext : public QPlatformInputContext {
      */
     Q_INVOKABLE bool focusItemHasEnterKeyAction(QObject *item) const;
 
+    /**
+     * This function register the InputPanel (QQucikItem) to the backend
+     * to handle the focusItem as parent
+     */
+    Q_INVOKABLE void registerInputPanel(QObject *inputPanel);
+
    protected:
     /**
      * Protected constructor - use instance function to get the one and only
@@ -135,7 +143,10 @@ class VirtualKeyboardInputContext : public QPlatformInputContext {
     static QObject *inputContextProvider(QQmlEngine *engine,
                                          QJSEngine *scriptEngine);
 
+   private:
     VirtualKeyboardInputContextPrivate *d;
+    QPointer<QObject> inputPanel;
+    std::shared_ptr<QMetaObject::Connection> visibleConnection;
 };
 
 #endif  // VIRTUALKEYBOARDINPUTCONTEXT_H
diff --git a/src/qml/InputPanel.qml b/src/qml/InputPanel.qml
@@ -20,6 +20,9 @@ Item {
     property string languageIcon: "qrc:/icons/language.png"
     property var availableLanguageLayouts: ["En"]
 
+    /*! \internal */
+    readonly property bool __isRootItem: inputPanel.parent !== null && inputPanel.parent.parent === null
+
     function showKeyPopup(keyButton) {
         keyPopup.popup(keyButton, root);
     }
@@ -34,14 +37,17 @@ Item {
 
     function loadLettersLayout() {
         var description = InputEngine.descriptionOfLayout(languageLayout);
+        var spaceIdentifier = InputEngine.spaceIdentifierOfLayout(languageLayout);
         var source = InputEngine.fileOfLayout(languageLayout);
         if (description !== "" && source !== "") {
             layoutLoader.langDescription = description;
+            layoutLoader.spaceIdentifier = spaceIdentifier;
             layoutLoader.setSource(source + ".qml", {
                 "inputPanel": root
             });
         } else {
             layoutLoader.langDescription = "English";
+            layoutLoader.spaceIdentifier = "space";
             layoutLoader.setSource("EnLayout.qml", {
                 "inputPanel": root
             });
@@ -59,6 +65,9 @@ Item {
     }
     onLanguageLayoutChanged: loadLettersLayout()
     Component.onCompleted: {
+
+        InputContext.registerInputPanel(root)
+
         if (availableLanguageLayouts.length == 0)
             availableLanguageLayouts = ["En"];
 
@@ -120,6 +129,8 @@ Item {
 
             // lang description only needed for layouts that share a file
             property string langDescription
+            // space identifier for the correct translation of the word "space"
+            property string spaceIdentifier
 
             anchors {
                 fill: parent

diff --git a/src/qml/QwertyLayout.qml b/src/qml/QwertyLayout.qml
@@ -225,6 +225,7 @@ ColumnLayout {
         SpaceKey {
             weight: 1168
             inputPanelRef: inputPanel
+            btnDisplayedText: spaceIdentifier
         }
 
         Key {

diff --git a/src/qml/SymbolLayout.qml b/src/qml/SymbolLayout.qml
@@ -244,6 +244,7 @@ Item {
             SpaceKey {
                 weight: 1168
                 inputPanelRef: inputPanel
+                btnDisplayedText: spaceIdentifier
             }
 
             Key {
@@ -492,6 +493,7 @@ Item {
             SpaceKey {
                 weight: 1168
                 inputPanelRef: inputPanel
+                btnDisplayedText: spaceIdentifier
             }
 
             Key {