diff options
| author | Risto Avila <risto.avila@qt.io> | 2019-11-12 09:19:25 +0200 |
|---|---|---|
| committer | Risto Avila <risto.avila@qt.io> | 2019-11-18 11:23:05 +0000 |
| commit | 9ce2ec6f6d5516173cfa97d2dd51df2136524470 (patch) | |
| tree | 6b587cbf50684304def80e356226e8d54573bfbe | |
| parent | 8e65d5beb9b2494fa853d291f7f57f9754ca0a2c (diff) | |
Fix keyboard being stuck on the sides on OpenBox environment
Fixes keyboard being stuck on the sides in OpenBox environment.
Change-Id: I70d4cbbe5f49b1851f9010b22a3d89f9e0f04c11
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit 32721b77eeaf7645f752a4669c30680a11694fab)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| -rw-r--r-- | tests/manual/x11vkbwrapper/Keyboard.qml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/manual/x11vkbwrapper/Keyboard.qml b/tests/manual/x11vkbwrapper/Keyboard.qml index f58e1dca..1c2fb046 100644 --- a/tests/manual/x11vkbwrapper/Keyboard.qml +++ b/tests/manual/x11vkbwrapper/Keyboard.qml @@ -74,13 +74,15 @@ Window { onTranslationChanged: { var dx = translation.x var dy = translation.y - if (keyboardWindow.x < 0) + var ksx = keyboardWindow.x + keyboardWindow.width + var ksy = keyboardWindow.y + keyboardWindow.height + if (keyboardWindow.x < 0 && (keyboardWindow.x + dx) < 0) dx = 0 - if (keyboardWindow.x + keyboardWindow.width > Screen.width) + if (ksx > Screen.width && (ksx + dx) > Screen.width) dx = 0 - if (keyboardWindow.y < 0) + if (keyboardWindow.y < 0 && (keyboardWindow.y + dy) < 0) dy = 0 - if (keyboardWindow.y + keyboardWindow.height > Screen.height) + if (ksy > Screen.height && (ksy + dy) > Screen.height) dy = 0 keyboardWindow.x += dx |