From f18e5f96abf89a7b0f5797ff5514799056077224 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 15 Jun 2021 17:13:08 +0200 Subject: [PATCH] Use Cura-style drop-down to select mesh type MacOS has some trouble with the QtQuick.Controls 1 system-styled drop-downs since Qt 5.15. We've removed the other ones, but forgot about this one. Contributes to issue CURA-8128. --- plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml index 05507fc4a2..7ab4bdb1a1 100644 --- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml +++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2017 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Uranium is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 @@ -136,10 +136,12 @@ Item } - ComboBox + Cura.ComboBox { id: infillOnlyComboBox width: parent.width / 2 - UM.Theme.getSize("default_margin").width + height: UM.Theme.getSize("setting_control").height + textRole: "text" model: ListModel {