From 685b80fc3af65a54249147b2ab08afd28ea083d6 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Wed, 2 May 2018 21:56:23 +0200 Subject: [PATCH] Fix more QML warnings --- .../resources/qml/ToolboxCompatibilityChart.qml | 12 ++++++------ plugins/Toolbox/resources/qml/ToolboxDetailTile.qml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml b/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml index 1c58b46b96..4f5589d8d0 100644 --- a/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml +++ b/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml @@ -36,8 +36,8 @@ Item Label { anchors.verticalCenter: parent.verticalCenter - elide: styleData.elideMode - text: styleData.value + elide: styleData.elideMode || Text.ElideNone + text: styleData.value || "" color: UM.Theme.getColor("text") font: UM.Theme.getFont("default_bold") } @@ -55,8 +55,8 @@ Item Label { anchors.verticalCenter: parent.verticalCenter - elide: styleData.elideMode - text: styleData.value + elide: styleData.elideMode || Text.ElideNone + text: styleData.value || "" color: UM.Theme.getColor("text_medium") font: UM.Theme.getFont("default") } @@ -67,8 +67,8 @@ Item Label { anchors.verticalCenter: parent.verticalCenter - elide: styleData.elideMode - text: styleData.value + elide: styleData.elideMode || Text.ElideNone + text: styleData.value || "" color: UM.Theme.getColor("text_medium") font: UM.Theme.getFont("default") } diff --git a/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml b/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml index e93fdb646f..b50a7466e4 100644 --- a/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml +++ b/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml @@ -12,7 +12,7 @@ Item property bool installed: toolbox.isInstalled(model.id) property var packageData: model width: detailList.width - UM.Theme.getSize("wide_margin").width - height: normalData.height + supportedConfigsChart.height + 3 * UM.Theme.getSize("default_margin").height + height: normalData.height + compatibilityChart.height + 3 * UM.Theme.getSize("default_margin").height Item { id: normalData