AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automatically reflect new input context input direction when locale changes

Browse Source 
All platforms except Wayland fail to check for input direction change
when the locale changes, and only emitLocaleChanged.

We can simplify this for the platforms by checking if the new
locale caused a change in input direction, and if so emit
inputDirectionChanged on their behalf.

Change-Id: I84d8df9392db5e716f5c277d0cc9e17e5a21783f
Reviewed-by: Liang Qi <liang.qi@qt.io>
This commit is contained in:
Tor Arne Vestbø 2023-09-20 22:38:26 +02:00
parent 84d0ebabaa
commit d9bb8c0a17
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/kernel/qplatforminputcontext.cpp
View File

@ -47,6 +47,11 @@ QT_BEGIN_NAMESPACE
QPlatformInputContext::QPlatformInputContext() QPlatformInputContext::QPlatformInputContext()
: QObject(*(new QPlatformInputContextPrivate)) : QObject(*(new QPlatformInputContextPrivate))
{ {
// Delay initialization of cached input direction
// until super class has finished constructing.
QMetaObject::invokeMethod(this, [this]{
m_inputDirection = inputDirection();
}, Qt::QueuedConnection);
} }
/*! /*!
@ -198,6 +203,9 @@ QLocale QPlatformInputContext::locale() const
void QPlatformInputContext::emitLocaleChanged() void QPlatformInputContext::emitLocaleChanged()
{ {
emit QGuiApplication::inputMethod()->localeChanged(); emit QGuiApplication::inputMethod()->localeChanged();
// Changing the locale might have updated the input direction
emitInputDirectionChanged(inputDirection());
} }
Qt::LayoutDirection QPlatformInputContext::inputDirection() const Qt::LayoutDirection QPlatformInputContext::inputDirection() const
@ -207,7 +215,11 @@ Qt::LayoutDirection QPlatformInputContext::inputDirection() const
void QPlatformInputContext::emitInputDirectionChanged(Qt::LayoutDirection newDirection) void QPlatformInputContext::emitInputDirectionChanged(Qt::LayoutDirection newDirection)
{ {
if (newDirection == m_inputDirection)
return;
emit QGuiApplication::inputMethod()->inputDirectionChanged(newDirection); emit QGuiApplication::inputMethod()->inputDirectionChanged(newDirection);
m_inputDirection = newDirection;
} }
/*! /*!

2
src/gui/kernel/qplatforminputcontext.h
View File

@ -72,6 +72,8 @@ private:
friend class QGuiApplication; friend class QGuiApplication;
friend class QGuiApplicationPrivate; friend class QGuiApplicationPrivate;
friend class QInputMethod; friend class QInputMethod;
Qt::LayoutDirection m_inputDirection;
}; };
QT_END_NAMESPACE QT_END_NAMESPACE