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-04-05 14:30:16 +0000
commita94870b1583857ee5a485ce68369373efb3a9fdc (patch)
tree04322f2d1cbb3cb7def228d30ab557909f152fcb
parent27696915b7977e245082dbb534d36f2165437378 (diff)
Fix full screen edit mode with word candidate list always visiblev5.11.0-beta4
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 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 ce02d406..012ec48a 100644
--- a/src/virtualkeyboard/content/components/Keyboard.qml
+++ b/src/virtualkeyboard/content/components/Keyboard.qml
@@ -550,7 +550,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 {