diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2017-09-14 14:29:25 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2017-09-15 10:32:12 +0000 |
| commit | f3683d17c364c4f84f1591dd60121041628f9a5c (patch) | |
| tree | d69cbd28ac59a45af4e8ebf85d3a06d8df8d37f8 | |
| parent | dfd70f4768b24b9885818e8df8fb9adffbe23477 (diff) | |
Ensure that EnterKey.label is actually shown
The ternary expressions were the wrong way around.
This patch also makes the disabled EnterKey text more visible, as it
was very hard to see before.
Change-Id: I73b61ac7076e4c132c78e2c40be294e45bef3cc9
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/virtualkeyboard/content/styles/default/style.qml | 4 | ||||
| -rw-r--r-- | src/virtualkeyboard/content/styles/retro/style.qml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/virtualkeyboard/content/styles/default/style.qml b/src/virtualkeyboard/content/styles/default/style.qml index 03f0344f..1440f008 100644 --- a/src/virtualkeyboard/content/styles/default/style.qml +++ b/src/virtualkeyboard/content/styles/default/style.qml @@ -263,7 +263,7 @@ KeyboardStyle { Text { id: enterKeyText visible: text.length !== 0 - text: control.actionId !== EnterKeyAction.None ? "" : control.displayText + text: control.actionId !== EnterKeyAction.None ? control.displayText : "" clip: true fontSizeMode: Text.HorizontalFit horizontalAlignment: Text.AlignHCenter @@ -309,7 +309,7 @@ KeyboardStyle { } PropertyChanges { target: enterKeyText - opacity: 0.05 + opacity: 0.2 } } ] diff --git a/src/virtualkeyboard/content/styles/retro/style.qml b/src/virtualkeyboard/content/styles/retro/style.qml index a1cb3ffc..0ed184b7 100644 --- a/src/virtualkeyboard/content/styles/retro/style.qml +++ b/src/virtualkeyboard/content/styles/retro/style.qml @@ -295,7 +295,7 @@ KeyboardStyle { Text { id: enterKeyText visible: text.length !== 0 - text: control.actionId !== EnterKeyAction.None ? "" : control.displayText + text: control.actionId !== EnterKeyAction.None ? control.displayText : "" clip: true fontSizeMode: Text.HorizontalFit horizontalAlignment: Text.AlignHCenter |