diff options
| author | Sander Ferdinand <sa.ferdinand@gmail.com> | 2017-11-25 22:53:07 +0100 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-03-29 23:04:01 +0100 |
| commit | 6d21b9919d5fc100eb3565fbe6038007c45ce078 (patch) | |
| tree | 7855e843d01c66e4cc8f5cbf65c2b45fa25be1d2 /components | |
| parent | 36ac2ee86dd159ce5c78381104cef1401377dcfe (diff) | |
| download | monzero-gui-6d21b9919d5fc100eb3565fbe6038007c45ce078.tar.gz monzero-gui-6d21b9919d5fc100eb3565fbe6038007c45ce078.tar.xz monzero-gui-6d21b9919d5fc100eb3565fbe6038007c45ce078.zip | |
InlineButton development
Diffstat (limited to 'components')
| -rw-r--r-- | components/InlineButton.qml | 13 | ||||
| -rw-r--r-- | components/Input.qml | 1 | ||||
| -rw-r--r-- | components/LineEdit.qml | 8 |
3 files changed, 12 insertions, 10 deletions
diff --git a/components/InlineButton.qml b/components/InlineButton.qml index da8120c3..9e3f3c04 100644 --- a/components/InlineButton.qml +++ b/components/InlineButton.qml @@ -47,10 +47,6 @@ Item { anchors.rightMargin: 8 anchors.topMargin: 8 - function onClicked(){ - console.log("debug click"); - } - function doClick() { // Android workaround releaseFocus(); @@ -58,10 +54,11 @@ Item { } Rectangle{ - color: "#808080" + id: rect + color: rect.enabled ? "#808080" : "#3b3b3b" border.color: "black" height: 32 - width: inlineText.width + 20 + width: inlineText.width + 22 radius: 4 anchors.top: parent.top @@ -70,14 +67,16 @@ Item { Text { id: inlineText font.family: Style.fontBold.name + font.bold: true font.pixelSize: 16 * scaleRatio - color: "#FFFFFF" + color: "black" anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter } MouseArea { id: buttonArea + cursorShape: Qt.PointingHandCursor anchors.fill: parent onClicked: doClick() } diff --git a/components/Input.qml b/components/Input.qml index b7e39eb2..6643af14 100644 --- a/components/Input.qml +++ b/components/Input.qml @@ -33,6 +33,7 @@ import "." 1.0 TextField { font.family: Style.fontRegular.name font.pixelSize: 22 + font.bold: true horizontalAlignment: TextInput.AlignLeft selectByMouse: true color: "white" diff --git a/components/LineEdit.qml b/components/LineEdit.qml index 964af52f..c6cd65de 100644 --- a/components/LineEdit.qml +++ b/components/LineEdit.qml @@ -37,6 +37,7 @@ Item { property alias readOnly : input.readOnly property alias cursorPosition: input.cursorPosition property alias echoMode: input.echoMode + property alias inlineButton: inlineButtonId property alias inlineButtonText: inlineButtonId.text property alias inlineIcon: inlineIcon.visible property int fontSize: 18 * scaleRatio @@ -70,9 +71,9 @@ Item { function getColor(error) { // @TODO: replace/remove this (implement as ternary?) if (error) - return Style.inputBoxBackground + return "transparent" else - return Style.inputBoxBackground + return "transparent" } Text { @@ -85,7 +86,7 @@ Item { font.pixelSize: 20 * scaleRatio color: "#FFFFFF" text: "" - visible: item.setPlaceholder() ? false : true + visible: input.text ? false : true z: 3 } @@ -128,6 +129,7 @@ Item { InlineButton { id: inlineButtonId + onClicked: inlineButtonId.onClicked visible: item.inlineButtonText ? true : false } } |