Commit 47d34c78 authored by Damien Caliste's avatar Damien Caliste

[fingerterm] Use actual labels in the visual key pressed feedback. Contributes TJC#198062

parent 552c8b4e
...@@ -26,8 +26,8 @@ Rectangle { ...@@ -26,8 +26,8 @@ Rectangle {
property string label_alt property string label_alt
property int code property int code
property int code_alt property int code_alt
property int currentCode: (shiftActive && label_alt != '') ? code_alt : code property int currentCode: isAltCurrent ? code_alt : code
property string currentLabel: (shiftActive && label_alt != '') ? label_alt : label property string currentLabel: isAltCurrent ? keyAltLabel.text : keyLabel.text
property bool sticky // can key be stickied? property bool sticky // can key be stickied?
property bool becomesSticky // will this become sticky after release? property bool becomesSticky // will this become sticky after release?
property int stickiness // current stickiness status property int stickiness // current stickiness status
...@@ -36,6 +36,7 @@ Rectangle { ...@@ -36,6 +36,7 @@ Rectangle {
// mouse input handling // mouse input handling
property bool isClick property bool isClick
property bool shiftActive: (keyboard.keyModifiers & Qt.ShiftModifier) && !sticky property bool shiftActive: (keyboard.keyModifiers & Qt.ShiftModifier) && !sticky
property bool isAltCurrent: shiftActive && label_alt != ''
width: window.width/12 // some default width: window.width/12 // some default
height: window.height/8 < 55*window.pixelRatio ? window.height/8 : 55*window.pixelRatio height: window.height/8 < 55*window.pixelRatio ? window.height/8 : 55*window.pixelRatio
...@@ -59,7 +60,7 @@ Rectangle { ...@@ -59,7 +60,7 @@ Rectangle {
Text { Text {
id: keyAltLabel id: keyAltLabel
property bool highlighted: key.shiftActive property bool highlighted: key.isAltCurrent
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
...@@ -76,7 +77,7 @@ Rectangle { ...@@ -76,7 +77,7 @@ Rectangle {
Text { Text {
id: keyLabel id: keyLabel
property bool highlighted: key.label_alt == '' || !key.shiftActive property bool highlighted: !key.isAltCurrent
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment