aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-09-19 14:38:00 +0200
committerLiang Qi <liang.qi@qt.io>2016-09-19 14:38:05 +0200
commit78fa7c11ea79067d819bbcbaa903086eae929015 (patch)
treedfb2af63b2a35f826be925c1c691694bfca73db6
parent2d9cb8747c01cec4f4a3a9f22ec320180f705481 (diff)
parent5ac6b611b196c66bc8b01c23aa50d175ae7a7308 (diff)
Merge remote-tracking branch 'origin/5.7' into 5.8
-rw-r--r--src/virtualkeyboard/content/components/BaseKey.qml7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/virtualkeyboard/content/components/BaseKey.qml b/src/virtualkeyboard/content/components/BaseKey.qml
index 7cc97306..c45efb32 100644
--- a/src/virtualkeyboard/content/components/BaseKey.qml
+++ b/src/virtualkeyboard/content/components/BaseKey.qml
@@ -229,6 +229,13 @@ Item {
onSoundEffectChanged: keyboard.soundEffect.register(soundEffect)
+ // QTBUG-54953, QTBUG-55773
+ // Avoid a row that was hidden taking up the entire height of the
+ // keyboard when it is made visible after the application has started.
+ // This value is low because keys can scale vertically, and setting e.g. 40
+ // pixels might be too high for a keyboard that doesn't have a lot of space.
+ implicitHeight: 1
+
Layout.minimumWidth: keyPanel.implicitWidth
Layout.minimumHeight: keyPanel.implicitHeight
Layout.preferredWidth: weight