Index: sources/gui/qml/components/TouchRect.qml =================================================================== diff -u -r45617764a63d5573bfb942b039f2854ed25ba15d -rcdb3ba0b019e5f279ca959b1e32ca0097261f6ef --- sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision 45617764a63d5573bfb942b039f2854ed25ba15d) +++ sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision cdb3ba0b019e5f279ca959b1e32ca0097261f6ef) @@ -40,8 +40,8 @@ signal clicked onDurationChanged: { - _colorAnimationOn .duration = duration; - _colorAnimationOff.duration = duration; + _colorAnimationOn .duration = duration + _colorAnimationOff.duration = duration } function animate(vAnimate) { @@ -60,9 +60,11 @@ if (disabled) { text.color = Colors.textDisableButton border.color = Colors.borderDisableButton + color = "Transparent" } else { text.color = textColor border.color = borderColor + color = backgroundColor } } @@ -71,12 +73,12 @@ radius : Variables.touchRectRadius color : backgroundColor border { - color: Colors.borderButton + color: borderColor width: Variables.borderWidth } Text { id: _text anchors.centerIn: parent - color: Colors.textMain + color: textColor font.pixelSize: Fonts.fontPixelButton } MouseArea { id: _mouseArea