aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarkko Koivikko <jarkko.koivikko@code-q.fi>2018-04-05 17:16:26 +0300
committerJarkko Koivikko <jarkko.koivikko@code-q.fi>2018-05-22 18:33:16 +0000
commitaa4d36fa46e99314aadbd98d394b0f87c43e875b (patch)
tree7d41f2e3d5a301f69e1264a7517f9dc0a5527d0c
parent5c9ce0adf6ef8b28bc6196326f711a9d039738ea (diff)
Fix full screen edit mode with word candidate list always visible
Full screen mode covers the entire screen when enabled. However, if also VirtualKeyboardSettings.wordCandidateList.alwaysVisible is true, the word candidate area was subtracted from the full screen mode area. This change fixes the issue, and does not subtract the area in this case. [ChangeLog] Fix full screen edit mode with word candidate list always visible. Task-number: QTBUG-67510 Change-Id: I816ccdb22be01e2f86fccacc6ba946ea202815ae (cherry picked from commit a94870b1583857ee5a485ce68369373efb3a9fdc) Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/virtualkeyboard/content/components/Keyboard.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/virtualkeyboard/content/components/Keyboard.qml b/src/virtualkeyboard/content/components/Keyboard.qml
index 2bd2ff2e..b0df0a20 100644
--- a/src/virtualkeyboard/content/components/Keyboard.qml
+++ b/src/virtualkeyboard/content/components/Keyboard.qml
@@ -557,7 +557,7 @@ Item {
anchors.right: parent.right
anchors.bottom: wordCandidateView.top
height: (keyboard.parent.parent ? keyboard.parent.parent.height : Screen.height) -
- keyboard.height - (wordCandidateView.visibleCondition ? wordCandidateView.height : 0)
+ keyboard.height - (wordCandidateView.visibleCondition && !VirtualKeyboardSettings.wordCandidateList.alwaysVisible ? wordCandidateView.height : 0)
visible: fullScreenMode && (shadowInputControlVisibleTimer.running || InputContext.animating)
Connections {