aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarkko Koivikko <jarkko.koivikko@code-q.fi>2017-07-31 16:37:45 +0300
committerJarkko Koivikko <jarkko.koivikko@code-q.fi>2017-08-04 15:51:41 +0000
commitc3c2a9cdef6a402f756799f835f724b999e942a4 (patch)
treee25e273a2129a79565f824f90248379c332084dd
parent251ba40de4f40bdb39d1260e5045d1517126c89b (diff)
Fix rendering of high and low acute accent keys in Zhuyin keyboard
The MODIFIER LETTER ACUTE ACCENT and MODIFIER LETTER GRAVE ACCENT were not rendered correctly on the keyboard layout. Fix it by defining regular accent characters in the displayText property. After adding the displayText, it was noticed that the character preview is not using the BaseKey::displayText for rendering. So fix it too. Change-Id: If4889729a33a31d6adaf149ca4d263a2004abe7e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/virtualkeyboard/content/components/CharacterPreviewBubble.qml2
-rw-r--r--src/virtualkeyboard/content/layouts/zh_TW/main.qml6
2 files changed, 5 insertions, 3 deletions
diff --git a/src/virtualkeyboard/content/components/CharacterPreviewBubble.qml b/src/virtualkeyboard/content/components/CharacterPreviewBubble.qml
index 1f9a05a2..ee70e110 100644
--- a/src/virtualkeyboard/content/components/CharacterPreviewBubble.qml
+++ b/src/virtualkeyboard/content/components/CharacterPreviewBubble.qml
@@ -45,7 +45,7 @@ Item {
onActiveKeyChanged: {
if (activeKey && characterPreview.item !== null) {
- characterPreview.item.text = InputContext.uppercase ? activeKey.text.toUpperCase() : activeKey.text
+ characterPreview.item.text = InputContext.uppercase ? activeKey.displayText.toUpperCase() : activeKey.displayText
width = activeKey.width
height = activeKey.height
var position = keyboard.mapFromItem(activeKey, 0, 0)
diff --git a/src/virtualkeyboard/content/layouts/zh_TW/main.qml b/src/virtualkeyboard/content/layouts/zh_TW/main.qml
index 2aa36ed2..7c5728c7 100644
--- a/src/virtualkeyboard/content/layouts/zh_TW/main.qml
+++ b/src/virtualkeyboard/content/layouts/zh_TW/main.qml
@@ -246,7 +246,8 @@ KeyboardLayoutLoader {
}
Key {
text: "\u02CB"
- alternativeKeys: "\u02CB4"
+ alternativeKeys: "4"
+ displayText: "`"
}
Key {
text: "\u3113"
@@ -254,7 +255,8 @@ KeyboardLayoutLoader {
}
Key {
text: "\u02CA"
- alternativeKeys: "\u02CA6"
+ alternativeKeys: "6"
+ displayText: "ยด"
}
Key {
text: "\u02D9"