From a9a20eb5ec403ff6fdac4f5d8ce0c11d31683b89 Mon Sep 17 00:00:00 2001 From: Marius Gripsgard Date: Sun, 1 Sep 2019 21:46:01 +0200 Subject: [PATCH 1/2] Set mask regardless of qt platform --- src/plugin/inputmethod_p.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugin/inputmethod_p.h b/src/plugin/inputmethod_p.h index d14673d1..561c4547 100644 --- 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) From 2883c549d66f0d8bb05006f21fa0dfa0ee953fb4 Mon Sep 17 00:00:00 2001 From: Marius Gripsgard Date: Wed, 4 Sep 2019 02:13:47 +0200 Subject: [PATCH 2/2] Set disabled height on wayland if settings is set --- src/plugin/inputmethod.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugin/inputmethod.cpp b/src/plugin/inputmethod.cpp index 2ff64fb9..7418eef5 100644 --- 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); }