diff options
| author | Sander Ferdinand <sa.ferdinand@gmail.com> | 2017-12-07 18:19:30 +0100 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-03-29 23:04:01 +0100 |
| commit | f48cd1b82b758c7b4e396e523172f66b9b371c5b (patch) | |
| tree | b74b2fb6581280f863dd0cc9c80a45edc04a1eee /components | |
| parent | 948669edbc6eecc84d6f5193fd3093d814bcdab4 (diff) | |
| download | monzero-gui-f48cd1b82b758c7b4e396e523172f66b9b371c5b.tar.gz monzero-gui-f48cd1b82b758c7b4e396e523172f66b9b371c5b.tar.xz monzero-gui-f48cd1b82b758c7b4e396e523172f66b9b371c5b.zip | |
Checkbox/Standard button development
Diffstat (limited to 'components')
| -rw-r--r-- | components/CheckBox.qml | 2 | ||||
| -rw-r--r-- | components/StandardButton.qml | 27 | ||||
| -rw-r--r-- | components/Style.qml | 4 |
3 files changed, 25 insertions, 8 deletions
diff --git a/components/CheckBox.qml b/components/CheckBox.qml index 8486eedc..f0b8ed9c 100644 --- a/components/CheckBox.qml +++ b/components/CheckBox.qml @@ -88,6 +88,8 @@ RowLayout { color: "#525252" wrapMode: Text.Wrap Layout.fillWidth: true + anchors.left: backgroundRect.right + anchors.leftMargin: !isMobile ? 10 : 8 MouseArea { anchors.fill: parent onClicked: { diff --git a/components/StandardButton.qml b/components/StandardButton.qml index b7c020e9..440505ee 100644 --- a/components/StandardButton.qml +++ b/components/StandardButton.qml @@ -39,12 +39,12 @@ Item { property string releasedColor: Style.buttonBackgroundColor property string icon: "" property string textColor: button.enabled? Style.buttonTextColor: Style.buttonTextColorDisabled - property int fontSize: 18 * scaleRatio + property int fontSize: 16 * scaleRatio property alias text: label.text signal clicked() // Dynamic label width - Layout.minimumWidth: (label.contentWidth > 50)? label.contentWidth + 10 : 60 + Layout.minimumWidth: (label.contentWidth > 50)? label.contentWidth + 22 : 60 function doClick() { // Android workaround @@ -56,16 +56,27 @@ Item { anchors.left: parent.left anchors.right: parent.right height: parent.height - 1 - y: buttonArea.pressed ? 0 : 1 radius: 3 color: parent.enabled ? Style.buttonBackgroundColor : Style.buttonBackgroundColorDisabled -// color: { -// parent.enabled ? (buttonArea.pressed ? parent.shadowPressedColor : parent.shadowReleasedColor) -// : Qt.lighter(parent.shadowReleasedColor) -// } border.color: Qt.darker(parent.releasedColor) border.width: parent.focus ? 1 : 0 + MouseArea{ + anchors.fill: parent + cursorShape: Qt.PointingHandCursor + hoverEnabled: true + + propagateComposedEvents: true + + onEntered: { + if(button.enabled) parent.color = Style.buttonBackgroundColorHover; + else parent.color = Style.buttonBackgroundColorDisabledHover; + } + onExited: { + if(button.enabled) parent.color = Style.buttonBackgroundColor; + else parent.color = Style.buttonBackgroundColorDisabled; + } + } } // Rectangle { @@ -91,7 +102,7 @@ Item { horizontalAlignment: Text.AlignHCenter font.family: Style.fontBold.name font.bold: true - font.pixelSize: button.fontSize + font.pixelSize: buttonArea.pressed ? button.fontSize - 1 : button.fontSize color: parent.textColor visible: parent.icon === "" // font.capitalization : Font.Capitalize diff --git a/components/Style.qml b/components/Style.qml index b7077095..256f5397 100644 --- a/components/Style.qml +++ b/components/Style.qml @@ -12,8 +12,12 @@ QtObject { property string inputBoxBackground: "black" property string inputBoxBackgroundError: "#FFDDDD" property string inputBoxColor: "white" + property string buttonBackgroundColor: "#FA6800" + property string buttonBackgroundColorHover: "#E65E00" property string buttonBackgroundColorDisabled: "#3B3B3B" + property string buttonBackgroundColorDisabledHover: "#4F4F4F" + property string buttonTextColor: "white" property string buttonTextColorDisabled: "black" property string dividerColor: "white" |