Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Use Key type for properties used only for Keys
  • Loading branch information
pvuorela committed Mar 6, 2017
1 parent 91828c7 commit 950ab70
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions qml/Key.qml
Expand Up @@ -161,7 +161,7 @@ Rectangle {
keyRepeatStarter.stop();
keyRepeatTimer.stop();
key.color = keyboard.keyBgColor;
keyboard.currentKeyPressed = 0;
keyboard.currentKeyPressed = null;

if (sticky && !becomesSticky) {
keyboard.keyModifiers &= ~code
Expand All @@ -184,7 +184,7 @@ Rectangle {
}

// first non-sticky press will cause the sticky to be released
if( !sticky && keyboard.resetSticky != 0 && keyboard.resetSticky !== key ) {
if( !sticky && keyboard.resetSticky && keyboard.resetSticky !== key ) {
resetSticky.setStickiness(0);
}
}
Expand All @@ -211,7 +211,7 @@ Rectangle {
function setStickiness(val)
{
if(sticky) {
if( keyboard.resetSticky != 0 && keyboard.resetSticky !== key ) {
if( keyboard.resetSticky && keyboard.resetSticky !== key ) {
resetSticky.setStickiness(0)
}

Expand All @@ -230,7 +230,7 @@ Rectangle {
keyboard.keyModifiers &= ~code
}

keyboard.resetSticky = 0
keyboard.resetSticky = null

if(stickiness==1) {
stickIndicator.anchors.topMargin = key.height/2
Expand Down
8 changes: 4 additions & 4 deletions qml/Keyboard.qml
Expand Up @@ -23,9 +23,9 @@ Item {
id: keyboard

property int keyModifiers
property var resetSticky: 0
property var currentStickyPressed: null
property var currentKeyPressed: 0
property Key resetSticky
property Key currentStickyPressed
property Key currentKeyPressed

property string keyFgColor: "#ffffff"
property string keyBgColor: "#202020"
Expand Down Expand Up @@ -86,7 +86,7 @@ Item {
}

onCurrentKeyPressedChanged: {
if(currentKeyPressed != 0 && currentKeyPressed.currentLabel.length === 1 && currentKeyPressed.currentLabel !== " ") {
if(currentKeyPressed && currentKeyPressed.currentLabel.length === 1 && currentKeyPressed.currentLabel !== " ") {
visualKeyFeedbackRect.label = currentKeyPressed.currentLabel
visualKeyFeedbackRect.width = currentKeyPressed.width*1.5
visualKeyFeedbackRect.height = currentKeyPressed.height*1.5
Expand Down

0 comments on commit 950ab70

Please sign in to comment.