diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-04-28 15:18:51 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-04-28 15:18:51 -0500 |
| commit | 7c8c6a116f39c24ffde38db1e5ad0681a11dfbe4 (patch) | |
| tree | e42a8c0683fc812f9b155c64eaa3bb11d623e118 | |
| parent | ef93139a808e6111094f5772eb810787f9a24061 (diff) | |
| parent | a810bf3eb79e837fe8930a510cc95e135a564771 (diff) | |
| download | monzero-gui-7c8c6a116f39c24ffde38db1e5ad0681a11dfbe4.tar.gz monzero-gui-7c8c6a116f39c24ffde38db1e5ad0681a11dfbe4.tar.xz monzero-gui-7c8c6a116f39c24ffde38db1e5ad0681a11dfbe4.zip | |
Merge pull request #2856
a810bf3 CheckBox: add enabled property (selsta)
| -rw-r--r-- | components/CheckBox.qml | 2 | ||||
| -rw-r--r-- | components/Style.qml | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/components/CheckBox.qml b/components/CheckBox.qml index 3925026d..7a1c6179 100644 --- a/components/CheckBox.qml +++ b/components/CheckBox.qml @@ -74,7 +74,7 @@ Item { visible: checkBox.border anchors.fill: parent radius: 3 - color: "transparent" + color: checkBox.enabled ? "transparent" : MoneroComponents.Style.inputBoxBackgroundDisabled border.color: if(checkBox.checked){ return MoneroComponents.Style.inputBorderColorActive; diff --git a/components/Style.qml b/components/Style.qml index 7b9f31ee..2edd555e 100644 --- a/components/Style.qml +++ b/components/Style.qml @@ -29,6 +29,7 @@ QtObject { property string textSelectedColor: blackTheme ? _b_textSelectedColor : _w_textSelectedColor property string inputBoxBackground: blackTheme ? _b_inputBoxBackground : _w_inputBoxBackground + property string inputBoxBackgroundDisabled: blackTheme ? _b_inputBoxBackgroundDisabled : _w_inputBoxBackgroundDisabled property string inputBoxBackgroundError: blackTheme ? _b_inputBoxBackgroundError : _w_inputBoxBackgroundError property string inputBoxColor: blackTheme ? _b_inputBoxColor : _w_inputBoxColor property string legacy_placeholderFontColor: blackTheme ? _b_legacy_placeholderFontColor : _w_legacy_placeholderFontColor @@ -88,6 +89,7 @@ QtObject { property string _b_textSelectedColor: "white" property string _b_inputBoxBackground: "black" + property string _b_inputBoxBackgroundDisabled: Qt.rgba(255, 255, 255, 0.10) property string _b_inputBoxBackgroundError: "#FFDDDD" property string _b_inputBoxColor: "white" property string _b_legacy_placeholderFontColor: "#BABABA" @@ -144,6 +146,7 @@ QtObject { property string _w_textSelectedColor: "black" property string _w_inputBoxBackground: "white" + property string _w_inputBoxBackgroundDisabled: Qt.rgba(0, 0, 0, 0.20) property string _w_inputBoxBackgroundError: "#FFDDDD" property string _w_inputBoxColor: "black" property string _w_legacy_placeholderFontColor: "#BABABA" |