diff --git a/resources/qml/CheckBoxWithTooltip.qml b/resources/qml/CheckBoxWithTooltip.qml index e17940014a..60315a05f0 100644 --- a/resources/qml/CheckBoxWithTooltip.qml +++ b/resources/qml/CheckBoxWithTooltip.qml @@ -28,11 +28,11 @@ CheckBox { anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter - width: Math.round(parent.width / 2.5) - height: Math.round(parent.height / 2.5) + height: UM.Theme.getSize("checkbox_mark").height + width: UM.Theme.getSize("checkbox_mark").width sourceSize.height: width color: UM.Theme.getColor("checkbox_mark") - source: UM.Theme.getIcon("Check") + source: UM.Theme.getIcon("EmptyCheck", "low") opacity: checkbox.checked Behavior on opacity { NumberAnimation { duration: 100; } } } diff --git a/resources/qml/Settings/SettingCheckBox.qml b/resources/qml/Settings/SettingCheckBox.qml index 20693b92e3..5f5d44700b 100644 --- a/resources/qml/Settings/SettingCheckBox.qml +++ b/resources/qml/Settings/SettingCheckBox.qml @@ -85,11 +85,11 @@ SettingItem { anchors { - top: parent.top - bottom: parent.bottom + verticalCenter: parent.verticalCenter left: parent.left } - width: height + width: UM.Theme.getSize("checkbox").width + height: width radius: UM.Theme.getSize("setting_control_radius").width border.width: UM.Theme.getSize("default_lining").width @@ -147,11 +147,11 @@ SettingItem { anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter - width: Math.round(parent.width / 2.5) - height: Math.round(parent.height / 2.5) + height: UM.Theme.getSize("checkbox_mark").height + width: UM.Theme.getSize("checkbox_mark").width sourceSize.height: width color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text"); - source: UM.Theme.getIcon("Check") + source: UM.Theme.getIcon("EmptyCheck", "low") opacity: control.checked ? 1 : 0 Behavior on opacity { NumberAnimation { duration: 100; } } } diff --git a/resources/qml/Widgets/CheckBox.qml b/resources/qml/Widgets/CheckBox.qml index 295283d76e..fde7458ede 100644 --- a/resources/qml/Widgets/CheckBox.qml +++ b/resources/qml/Widgets/CheckBox.qml @@ -54,11 +54,11 @@ CheckBox { anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter - width: Math.round(parent.width / 2.5) - height: Math.round(parent.height / 2.5) + height: UM.Theme.getSize("checkbox_mark").height + width: UM.Theme.getSize("checkbox_mark").width sourceSize.height: width color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text") - source: UM.Theme.getIcon("Check") + source: UM.Theme.getIcon("EmptyCheck", "low") opacity: control.checked ? 1 : 0 Behavior on opacity { NumberAnimation { duration: 100; } } } diff --git a/resources/themes/cura-light/styles.qml b/resources/themes/cura-light/styles.qml index 1320b54f37..84ba65393e 100755 --- a/resources/themes/cura-light/styles.qml +++ b/resources/themes/cura-light/styles.qml @@ -408,7 +408,7 @@ QtObject color: (control.hovered || control._hovered) ? UM.Theme.getColor("checkbox_hover") : (control.enabled ? UM.Theme.getColor("checkbox") : UM.Theme.getColor("checkbox_disabled")) Behavior on color { ColorAnimation { duration: 50; } } - + anchors.verticalCenter: parent.verticalCenter radius: control.exclusiveGroup ? Math.round(UM.Theme.getSize("checkbox").width / 2) : UM.Theme.getSize("checkbox_radius").width border.width: UM.Theme.getSize("default_lining").width @@ -418,11 +418,11 @@ QtObject { anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter - width: Math.round(parent.width / 2.5) - height: Math.round(parent.height / 2.5) + height: UM.Theme.getSize("checkbox_mark").height + width: UM.Theme.getSize("checkbox_mark").width sourceSize.height: width color: UM.Theme.getColor("checkbox_mark") - source: control.exclusiveGroup ? UM.Theme.getIcon("Dot") : UM.Theme.getIcon("Check") + source: control.exclusiveGroup ? UM.Theme.getIcon("Dot") : UM.Theme.getIcon("EmptyCheck", "low") opacity: control.checked Behavior on opacity { NumberAnimation { duration: 100; } } } @@ -460,8 +460,8 @@ QtObject { anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter - width: Math.round(parent.width / 2.5) - height: Math.round(parent.height / 2.5) + height: UM.Theme.getSize("checkbox_mark").height + width: UM.Theme.getSize("checkbox_mark").width sourceSize.height: width color: UM.Theme.getColor("checkbox_mark") source: @@ -472,7 +472,7 @@ QtObject } else { - return control.exclusiveGroup ? UM.Theme.getIcon("Dot", "low") : UM.Theme.getIcon("Check"); + return control.exclusiveGroup ? UM.Theme.getIcon("Dot", "low") : UM.Theme.getIcon("EmptyCheck", "low"); } } opacity: control.checked