1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

client: emit QInputMethod::visibleChanged() for qt_text_input_method_v1

Browse Source 
Also emit keyboardRectangleChanged() when necessary.

This amends 6578795ab5de18d1a39c3a31c619a4414eca7453 .

Pick-to: 6.2
Fixes: QTBUG-96298
Done-With: Paul Olav Tvete <paul.tvete@qt.io>
Change-Id: I5095f9b921f85851c7525d45fe6f8fe219c963fb
Reviewed-by: Inho Lee <inho.lee@qt.io>
Reviewed-by: David Edmundson <davidedmundson@kde.org>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Liang Qi 2021-10-28 13:13:58 +02:00
parent dcac8ed7df
commit eeaf852d48
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/platforms/wayland/qwaylandinputmethodcontext.cpp
View File

@ -43,6 +43,7 @@
#include <QtGui/qguiapplication.h>
#include <QtGui/qtextformat.h>
#include <QtGui/private/qguiapplication_p.h>
QT_BEGIN_NAMESPACE
@ -64,7 +65,10 @@ QWaylandTextInputMethod::~QWaylandTextInputMethod()
void QWaylandTextInputMethod::text_input_method_v1_visible_changed(int32_t visible)
{
m_isVisible = visible;
if (m_isVisible != visible) {
m_isVisible = visible;
QGuiApplicationPrivate::platformIntegration()->inputContext()->emitInputPanelVisibleChanged();
}
}
void QWaylandTextInputMethod::text_input_method_v1_locale_changed(const QString &localeName)
@ -79,10 +83,14 @@ void QWaylandTextInputMethod::text_input_method_v1_input_direction_changed(int32
void QWaylandTextInputMethod::text_input_method_v1_keyboard_rectangle_changed(wl_fixed_t x, wl_fixed_t y, wl_fixed_t width, wl_fixed_t height)
{
m_keyboardRect = QRectF(wl_fixed_to_double(x),
wl_fixed_to_double(y),
wl_fixed_to_double(width),
wl_fixed_to_double(height));
const QRectF keyboardRectangle(wl_fixed_to_double(x),
wl_fixed_to_double(y),
wl_fixed_to_double(width),
wl_fixed_to_double(height));
if (m_keyboardRect != keyboardRectangle) {
m_keyboardRect = keyboardRectangle;
QGuiApplicationPrivate::platformIntegration()->inputContext()->emitKeyboardRectChanged();
}
}
void QWaylandTextInputMethod::text_input_method_v1_start_input_method_event(uint32_t serial, int32_t surrounding_text_offset)