From d9c4edf0935d80bff6d474737a3f5b2d494ba997 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 21 Feb 2019 16:36:14 +0100 Subject: [PATCH] Prevent a few expensive conversions from happening in the QML --- resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml | 4 ++-- resources/qml/Menus/MaterialMenu.qml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml index 606dc142be..29e9cd6353 100644 --- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml +++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml @@ -240,10 +240,10 @@ Item { id: materialSelection - property bool valueError: Cura.MachineManager.activeStack != null ? Cura.ContainerManager.getContainerMetaDataEntry(Cura.MachineManager.activeStack.material.id, "compatible", "") != "True" : true + property bool valueError: Cura.MachineManager.activeStack !== null ? Cura.ContainerManager.getContainerMetaDataEntry(Cura.MachineManager.activeStack.material.id, "compatible", "") !== "True" : true property bool valueWarning: !Cura.MachineManager.isActiveQualitySupported - text: Cura.MachineManager.activeStack != null ? Cura.MachineManager.activeStack.material.name : "" + text: Cura.MachineManager.activeStack !== null ? Cura.MachineManager.activeStack.material.name : "" tooltip: text height: UM.Theme.getSize("print_setup_big_item").height diff --git a/resources/qml/Menus/MaterialMenu.qml b/resources/qml/Menus/MaterialMenu.qml index 0116169ed6..0264ad8fc7 100644 --- a/resources/qml/Menus/MaterialMenu.qml +++ b/resources/qml/Menus/MaterialMenu.qml @@ -97,7 +97,7 @@ Menu id: brandMaterialsMenu title: materialName property string materialName: model.name - property var brandMaterialColors: model.colors + property ListModel brandMaterialColors: model.colors Instantiator {