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

Fix the logic for decoding modifiers map in Wayland text input protocol

Browse Source 
Correctly check for the flags in the modifiers map when we get it from
the compositor, instead of modifying the map in the for loop conditional.

[ChangeLog][QWaylandInputContext] Fix modifiers map decoding
logic when receiving the map from the compositor.

Fixes: QTBUG-97094
Pick-to: 6.2 5.15 5.12
Change-Id: Idad19f7b1f4560d40abbb5b31032360cfe915261
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
This commit is contained in:
Rodney Dawes 2021-10-04 16:31:30 -04:00
parent 36f4cf3900
commit 201af1b56b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/platforms/wayland/qwaylandinputcontext.cpp
View File

@ -389,8 +389,10 @@ void QWaylandTextInput::zwp_text_input_v2_input_method_changed(uint32_t serial,
Qt::KeyboardModifiers QWaylandTextInput::modifiersToQtModifiers(uint32_t modifiers)
{
Qt::KeyboardModifiers ret = Qt::NoModifier;
for (int i = 0; modifiers >>= 1; ++i) {
ret |= m_modifiersMap[i];
for (int i = 0; i < m_modifiersMap.size(); ++i) {
if (modifiers & (1 << i)) {
ret |= m_modifiersMap[i];
}
}
return ret;
}