From a94870b1583857ee5a485ce68369373efb3a9fdc Mon Sep 17 00:00:00 2001 From: Jarkko Koivikko Date: Thu, 5 Apr 2018 17:16:26 +0300 Subject: 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 Reviewed-by: Mitch Curtis --- src/virtualkeyboard/content/components/Keyboard.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 { -- cgit v1.2.3