From c00eb5b432c6842ff872e086d6b893e27a967b94 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Fri, 18 Feb 2022 18:15:48 +0100 Subject: [PATCH] Align checkbox with category icon in per object visibility settings dialog and preferences visibility settings. Move "Information" icon to the right of checkboxes in settings visibilty preferences page. This allows clean aligning of checkboxes with category icon. CURA-8688 --- .../PerObjectCategory.qml | 19 +++++++++++++------ .../PerObjectSettingsTool/PerObjectItem.qml | 3 ++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/plugins/PerObjectSettingsTool/PerObjectCategory.qml b/plugins/PerObjectSettingsTool/PerObjectCategory.qml index 3f95d4e021..1800555b9d 100644 --- a/plugins/PerObjectSettingsTool/PerObjectCategory.qml +++ b/plugins/PerObjectSettingsTool/PerObjectCategory.qml @@ -11,19 +11,26 @@ import ".." Button { id: base; - background: Item { } + background: Item {} contentItem: Row { spacing: UM.Theme.getSize("default_lining").width - UM.RecolorImage + Item //Wrapper to give space before icon with fixed width. This allows aligning checkbox with category icon. { - anchors.verticalCenter: parent.verticalCenter - height: (label.height / 2) | 0 + height: label.height width: height - source: base.checked ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight"); - color: base.hovered ? palette.highlight : palette.buttonText + anchors.verticalCenter: parent.verticalCenter + + UM.RecolorImage + { + anchors.verticalCenter: parent.verticalCenter + height: (label.height / 2) | 0 + width: height + source: base.checked ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight"); + color: base.hovered ? palette.highlight : palette.buttonText + } } UM.RecolorImage { diff --git a/plugins/PerObjectSettingsTool/PerObjectItem.qml b/plugins/PerObjectSettingsTool/PerObjectItem.qml index d5582b9643..0c8015541e 100644 --- a/plugins/PerObjectSettingsTool/PerObjectItem.qml +++ b/plugins/PerObjectSettingsTool/PerObjectItem.qml @@ -19,7 +19,8 @@ UM.TooltipArea Item { id: spacer - width: 5 + // Align checkbox with PerObjectCategory icon + width: UM.Theme.getSize("default_margin").width } UM.CheckBox