Index: sources/gui/qml/components/NumPad.qml =================================================================== diff -u -r23121e17d1a6120ae4a31930e18de362d9533bcb -ree27c59d21daf9ad067d3cb5327fadd7c73b9838 --- sources/gui/qml/components/NumPad.qml (.../NumPad.qml) (revision 23121e17d1a6120ae4a31930e18de362d9533bcb) +++ sources/gui/qml/components/NumPad.qml (.../NumPad.qml) (revision ee27c59d21daf9ad067d3cb5327fadd7c73b9838) @@ -36,21 +36,20 @@ readonly property string backSpace : "qrc:/images/iBackspace" property bool isOpened : false - - onVisibleChanged : if ( ! _root.visible ) { reset() } - onDisplayValueChanged : if ( _root.setter ) { _root.setter( _valueLabel.text ) } - onSettingValueChanged : _valueLabel.text = _root.settingValue !== undefined ? _root.settingValue : "" width : 450 height : 500 visible : false radius : 9 - color : Colors.transparent + color : Colors.backgroundMain + x : Math.round((Variables.applicationWidth - _root.width) / 2) + y : Math.round((Variables.applicationHeight - _root.height) / 2) + onVisibleChanged : if ( ! _root.visible ) { reset() } + onDisplayValueChanged : if ( _root.setter ) { _root.setter( _valueLabel.text ) } + onSettingValueChanged : _valueLabel.text = _root.settingValue !== undefined ? _root.settingValue : "" + signal cancel() - x: Math.round((Variables.applicationWidth - _root.width) / 2) - y: Math.round((Variables.applicationHeight - _root.height) / 2) - // slide animation Behavior on x { NumberAnimation { duration: Variables.keybardAnimationDuration } } @@ -93,22 +92,6 @@ _root.displayValue = "" } - Image { id: _backgroundImage - anchors.fill: parent - source : "qrc:/images/iPopupGradient" - fillMode : Image.PreserveAspectCrop - - layer.enabled : true - layer.effect: OpacityMask { - maskSource: Rectangle { - width : _backgroundImage.width - height : _backgroundImage.height - radius : _root.radius - antialiasing : true - } - } - } - TouchRect { id : _sliderButton anchors { verticalCenter : parent.verticalCenter @@ -172,6 +155,17 @@ } } + Rectangle { + anchors { + top : _root.top + bottom : _root.bottom + right : _root.left + rightMargin : -10 + } + width : 20 + color : _root.color + } + Text { id: _unitText anchors { horizontalCenter: parent.horizontalCenter