Merge pull request #9 from ubports/wayland-fixes

Wayland fixes
maliit · Aug 14, 2020 · f497cc1 · f497cc1
2 parents b7249d5 + 2883c54
commit f497cc1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/plugin/inputmethod.cpp b/src/plugin/inputmethod.cpp
@@ -654,7 +654,8 @@ void InputMethod::onVisibleRectChanged()
 
     QRect visibleRect = d->m_geometry->visibleRect().toRect();
 
-    if (d->m_settings.disableHeight() && QGuiApplication::platformName() == QLatin1String("ubuntumirclient")) {
+    if (d->m_settings.disableHeight() &&
+        (QGuiApplication::platformName() == "ubuntumirclient" || QGuiApplication::platformName() == "wayland")) {
         visibleRect.setHeight(0);
     }
 

diff --git a/src/plugin/inputmethod_p.h b/src/plugin/inputmethod_p.h
@@ -185,12 +185,12 @@ class InputMethodPrivate
 
         if (QGuiApplication::platformName() == QLatin1String("ubuntumirclient")) {
             view->setFlags(InputMethodWindowType); /* Mir-only OSK window type */
-
-            // When keyboard geometry changes, update the window's input mask
-            QObject::connect(m_geometry, &KeyboardGeometry::visibleRectChanged, view, [this]() {
-                view->setMask(m_geometry->visibleRect().toRect());
-            });
         }
+
+        // When keyboard geometry changes, update the window's input mask
+        QObject::connect(m_geometry, &KeyboardGeometry::visibleRectChanged, view, [this]() {
+            view->setMask(m_geometry->visibleRect().toRect());
+        });
     }
 
     void setLayoutOrientation(Qt::ScreenOrientation screenOrientation)