diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2017-04-19 10:37:12 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2017-04-27 07:00:15 +0000 |
| commit | 4bfb464570c0a61c38ff237e8eb8bdc8536a134d (patch) | |
| tree | 3538d2ae6914e854db336f1e73028a73d5ebd67b /src | |
| parent | 32f8cbae90d7d5f5a23a645b39a2f1a29d378af8 (diff) | |
winrt: Remove wrong parameter from handleExtendedKeyEvent call
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/winrt/qwinrtscreen.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/plugins/platforms/winrt/qwinrtscreen.cpp b/src/plugins/platforms/winrt/qwinrtscreen.cpp index 7ac4bdac6c..19b8b0b827 100644 --- a/src/plugins/platforms/winrt/qwinrtscreen.cpp +++ b/src/plugins/platforms/winrt/qwinrtscreen.cpp @@ -991,9 +991,7 @@ HRESULT QWinRTScreen::onKeyDown(ABI::Windows::UI::Core::ICoreWindow *, ABI::Wind virtualKey, 0, QString(), - d->activeKeys.value(key).isAutoRepeat, - !status.RepeatCount ? 1 : status.RepeatCount, - false); + d->activeKeys.value(key).isAutoRepeat); } else { d->activeKeys.insert(key, KeyInfo(virtualKey)); } @@ -1021,9 +1019,7 @@ HRESULT QWinRTScreen::onKeyDown(ABI::Windows::UI::Core::ICoreWindow *, ABI::Wind virtualKey, 0, QString(), - d->activeKeys.value(key).isAutoRepeat, - !status.RepeatCount ? 1 : status.RepeatCount, - false); + d->activeKeys.value(key).isAutoRepeat); return S_OK; } @@ -1048,9 +1044,7 @@ HRESULT QWinRTScreen::onKeyUp(ABI::Windows::UI::Core::ICoreWindow *, ABI::Window virtualKey, 0, info.text, - false, // The final key release does not have autoRepeat set on Windows - !status.RepeatCount ? 1 : status.RepeatCount, - false); + false); // The final key release does not have autoRepeat set on Windows return S_OK; } @@ -1081,9 +1075,7 @@ HRESULT QWinRTScreen::onCharacterReceived(ICoreWindow *, ICharacterReceivedEvent info.virtualKey, 0, text, - info.isAutoRepeat, - !status.RepeatCount ? 1 : status.RepeatCount, - false); + info.isAutoRepeat); return S_OK; } |