diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml index f10cb5f22d..a53f051db8 100644 --- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml +++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml @@ -187,7 +187,7 @@ Item // It kinda looks ugly otherwise (big panel, no content on it) id: currentSettings property int maximumHeight: 200 * screenScaleFactor - height: Math.min(contents.count * ((UM.Theme.getSize("section").height + UM.Theme.getSize("narrow_margin").height) + UM.Theme.getSize("default_lining").height), maximumHeight) + height: Math.min(contents.count * (UM.Theme.getSize("section").height + UM.Theme.getSize("narrow_margin").height + UM.Theme.getSize("default_lining").height), maximumHeight) visible: currentMeshType != "anti_overhang_mesh" ListView @@ -245,7 +245,7 @@ Item { id: settingLoader width: UM.Theme.getSize("setting").width - height: UM.Theme.getSize("section").height + UM.Theme.getSize("narrow_margin").height + height: UM.Theme.getSize("section").height + UM.Theme.getSize("narrow_margin").height enabled: provider.properties.enabled === "True" property var definition: model property var settingDefinitionsModel: addedSettingsModel diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml index d7bf44d2b9..fa36192a42 100644 --- a/resources/qml/Settings/SettingItem.qml +++ b/resources/qml/Settings/SettingItem.qml @@ -18,7 +18,6 @@ Item anchors.right: parent.right // To avoid overlapping with the scrollBars - //anchors.rightMargin: UM.Theme.getSize("thin_margin").width property alias contents: controlContainer.children property alias hovered: mouse.containsMouse diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml index 12c9eee8a7..4c1b6ff109 100644 --- a/resources/qml/Settings/SettingView.qml +++ b/resources/qml/Settings/SettingView.qml @@ -217,7 +217,7 @@ Item { id: delegate - width: contents.width - (scrollBar.width +UM.Theme.getSize("narrow_margin").width) + width: contents.width - (scrollBar.width + UM.Theme.getSize("narrow_margin").width) Behavior on height { NumberAnimation { duration: 100 } } opacity: enabled ? 1 : 0 Behavior on opacity { NumberAnimation { duration: 100 } }