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

TextInputV3: Remove unnecessary enableSurface/disableSurface

Browse Source 
zwp_text_input_v3's enter/leave events are doing enable/disable
the surfaces.
enableSurface/disableSurface are called by setFocusObject and
it follows enter/leave.
These redundant routines are removed in TextInputV3

Fixes: QTBUG-120533
Pick-to: 6.7
Change-Id: I080c67629d7cf9a9029414f5a0ea6735cfe4642a
Reviewed-by: David Edmundson <davidedmundson@kde.org>
This commit is contained in:
Inho Lee 2024-01-17 12:03:59 +01:00
parent c15b219108
commit e992607d50
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/platforms/wayland/qwaylandtextinputv3.cpp
View File

@ -43,7 +43,7 @@ const Qt::InputMethodQueries supportedQueries3 = Qt::ImEnabled |
void QWaylandTextInputv3::zwp_text_input_v3_enter(struct ::wl_surface *surface)
{
qCDebug(qLcQpaWaylandTextInput) << Q_FUNC_INFO;
qCDebug(qLcQpaWaylandTextInput) << Q_FUNC_INFO << m_surface << surface;
m_surface = surface;
@ -185,21 +185,6 @@ void QWaylandTextInputv3::reset()
m_pendingPreeditString.clear();
}
void QWaylandTextInputv3::enableSurface(::wl_surface *)
{
qCDebug(qLcQpaWaylandTextInput) << Q_FUNC_INFO;
}
void QWaylandTextInputv3::disableSurface(::wl_surface *surface)
{
qCDebug(qLcQpaWaylandTextInput) << Q_FUNC_INFO;
if (m_surface != surface) {
qCWarning(qLcQpaWaylandTextInput()) << Q_FUNC_INFO << "for surface" << surface << "focused surface" << m_surface;
return;
}
}
void QWaylandTextInputv3::commit()
{
m_currentSerial = (m_currentSerial < UINT_MAX) ? m_currentSerial + 1U: 0U;

6
src/plugins/platforms/wayland/qwaylandtextinputv3_p.h
View File

@ -49,8 +49,10 @@ public:
QLocale locale() const override;
Qt::LayoutDirection inputDirection() const override;
void enableSurface(::wl_surface *surface) override;
void disableSurface(::wl_surface *surface) override;
// doing nothing in zwp_text_input_v3.
// enter() and leave() takes the role to enable/disable the surface
void enableSurface(::wl_surface *) override {};
void disableSurface(::wl_surface *) override {};
protected:
void zwp_text_input_v3_enter(struct ::wl_surface *surface) override;