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

winrt: Remove wrong parameter from handleExtendedKeyEvent call

Browse Source 
The event's count parameter is used to determine the number of keys
involved in the key event, not the repeat count of the key press.

The desktop windows implementation does not pass the "count" parameter,
so we omit it as well.

The tryShortcutOverride parameter is only used on macOS and thus can be
omitted as well.

Change-Id: Id7554e43cc73ec616f68444e82a38418e622e20a
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
This commit is contained in:
Oliver Wolff 2017-04-19 10:37:12 +02:00
parent 32f8cbae90
commit 4bfb464570
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/platforms/winrt/qwinrtscreen.cpp
View File

@ -991,9 +991,7 @@ HRESULT QWinRTScreen::onKeyDown(ABI::Windows::UI::Core::ICoreWindow *, ABI::Wind
virtualKey, virtualKey,
0, 0,
QString(), QString(),
d->activeKeys.value(key).isAutoRepeat, d->activeKeys.value(key).isAutoRepeat);
!status.RepeatCount ? 1 : status.RepeatCount,
false);
} else { } else {
d->activeKeys.insert(key, KeyInfo(virtualKey)); d->activeKeys.insert(key, KeyInfo(virtualKey));
} }
@ -1021,9 +1019,7 @@ HRESULT QWinRTScreen::onKeyDown(ABI::Windows::UI::Core::ICoreWindow *, ABI::Wind
virtualKey, virtualKey,
0, 0,
QString(), QString(),
d->activeKeys.value(key).isAutoRepeat, d->activeKeys.value(key).isAutoRepeat);
!status.RepeatCount ? 1 : status.RepeatCount,
false);
return S_OK; return S_OK;
} }
@ -1048,9 +1044,7 @@ HRESULT QWinRTScreen::onKeyUp(ABI::Windows::UI::Core::ICoreWindow *, ABI::Window
virtualKey, virtualKey,
0, 0,
info.text, info.text,
false, // The final key release does not have autoRepeat set on Windows false); // The final key release does not have autoRepeat set on Windows
!status.RepeatCount ? 1 : status.RepeatCount,
false);
return S_OK; return S_OK;
} }
@ -1081,9 +1075,7 @@ HRESULT QWinRTScreen::onCharacterReceived(ICoreWindow *, ICharacterReceivedEvent
info.virtualKey, info.virtualKey,
0, 0,
text, text,
info.isAutoRepeat, info.isAutoRepeat);
!status.RepeatCount ? 1 : status.RepeatCount,
false);
return S_OK; return S_OK;
} }