diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-17 22:55:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-17 22:55:40 +0200 |
| commit | 5ac6b611b196c66bc8b01c23aa50d175ae7a7308 (patch) | |
| tree | bf93742f576001112cf0b31ec7ac0b05cb63674f | |
| parent | ad1da1a8c3be6ec804f3965b47d0762654f81731 (diff) | |
| parent | 13a199e6e2c5f27b0f12eff380df4f0c0d156e6e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.1
Change-Id: I74ff8fb7833b2814c2baa07c0b78b4ed8cddb920
| -rw-r--r-- | src/virtualkeyboard/content/components/BaseKey.qml | 7 |
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 |