From 6ae0e08b7dfb8c956ff06ad5e5dc5adbcfd11913 Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Tue, 10 Dec 2019 13:19:10 +0100 Subject: [PATCH] Change RadioCheckbar active button color The RadioCheckbar active button is now using the slider_groove_fill value instead of the small_button_active value to avoid issues in case the small_button_active and small_button_text are used together. --- resources/qml/RadioCheckbar.qml | 2 +- resources/themes/cura-dark/theme.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/RadioCheckbar.qml b/resources/qml/RadioCheckbar.qml index 96afe5bb3c..0b8709fe7a 100644 --- a/resources/qml/RadioCheckbar.qml +++ b/resources/qml/RadioCheckbar.qml @@ -13,7 +13,7 @@ Item property color activeColor: UM.Theme.getColor("primary") property color inactiveColor: UM.Theme.getColor("slider_groove") - property color defaultItemColor: UM.Theme.getColor("small_button_active") + property color defaultItemColor: UM.Theme.getColor("slider_groove_fill") property color defaultItemFillColor: UM.Theme.getColor("main_background") property int checkboxSize: Math.round(UM.Theme.getSize("radio_button").height * 0.75) property int inactiveMarkerSize: 2 * barSize diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index a724fcc117..282004c3a9 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -60,7 +60,7 @@ "small_button": [39, 44, 48, 0], "small_button_hover": [39, 44, 48, 255], - "small_button_active": [255, 255, 255, 255], + "small_button_active": [67, 72, 75, 255], "small_button_active_hover": [67, 72, 75, 255], "small_button_text": [255, 255, 255, 197], "small_button_text_hover": [255, 255, 255, 255],