From bc1fa5c3f9b361ca7f0c764eea5dab7b56fbb9df Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Fri, 1 Jun 2018 09:38:37 +0200 Subject: [PATCH 1/3] CURA-5435 Attempt to fix "wobbly" text --- plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml b/plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml index ebd4d979f6..b16564fdd2 100644 --- a/plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml +++ b/plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml @@ -16,7 +16,7 @@ Item { color: UM.Theme.getColor("lining") width: parent.width - height: UM.Theme.getSize("default_lining").height + height: Math.floor(UM.Theme.getSize("default_lining").height) anchors.bottom: parent.bottom } Row @@ -47,7 +47,7 @@ Item { text: model.name width: parent.width - height: UM.Theme.getSize("toolbox_property_label").height + height: Math.floor(UM.Theme.getSize("toolbox_property_label").height) wrapMode: Text.WordWrap font: UM.Theme.getFont("default_bold") color: pluginInfo.color @@ -81,7 +81,7 @@ Item } } width: parent.width - height: UM.Theme.getSize("toolbox_property_label").height + height: Math.floor(UM.Theme.getSize("toolbox_property_label").height) wrapMode: Text.WordWrap verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft From 9b5369a5b1b3b27bd9bdc5b393797980caa2a459 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Fri, 1 Jun 2018 09:38:45 +0200 Subject: [PATCH 2/3] Revert "CURA-5435 Attempt to fix "wobbly" text" This reverts commit bc1fa5c3f9b361ca7f0c764eea5dab7b56fbb9df. --- plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml b/plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml index b16564fdd2..ebd4d979f6 100644 --- a/plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml +++ b/plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml @@ -16,7 +16,7 @@ Item { color: UM.Theme.getColor("lining") width: parent.width - height: Math.floor(UM.Theme.getSize("default_lining").height) + height: UM.Theme.getSize("default_lining").height anchors.bottom: parent.bottom } Row @@ -47,7 +47,7 @@ Item { text: model.name width: parent.width - height: Math.floor(UM.Theme.getSize("toolbox_property_label").height) + height: UM.Theme.getSize("toolbox_property_label").height wrapMode: Text.WordWrap font: UM.Theme.getFont("default_bold") color: pluginInfo.color @@ -81,7 +81,7 @@ Item } } width: parent.width - height: Math.floor(UM.Theme.getSize("toolbox_property_label").height) + height: UM.Theme.getSize("toolbox_property_label").height wrapMode: Text.WordWrap verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft From cca51cb74b8befea5cab8d078587d06c1b952bcc Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Fri, 1 Jun 2018 09:39:04 +0200 Subject: [PATCH 3/3] Revert "Revert "CURA-5435 Attempt to fix "wobbly" text"" This reverts commit 9b5369a5b1b3b27bd9bdc5b393797980caa2a459. --- plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml b/plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml index ebd4d979f6..b16564fdd2 100644 --- a/plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml +++ b/plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml @@ -16,7 +16,7 @@ Item { color: UM.Theme.getColor("lining") width: parent.width - height: UM.Theme.getSize("default_lining").height + height: Math.floor(UM.Theme.getSize("default_lining").height) anchors.bottom: parent.bottom } Row @@ -47,7 +47,7 @@ Item { text: model.name width: parent.width - height: UM.Theme.getSize("toolbox_property_label").height + height: Math.floor(UM.Theme.getSize("toolbox_property_label").height) wrapMode: Text.WordWrap font: UM.Theme.getFont("default_bold") color: pluginInfo.color @@ -81,7 +81,7 @@ Item } } width: parent.width - height: UM.Theme.getSize("toolbox_property_label").height + height: Math.floor(UM.Theme.getSize("toolbox_property_label").height) wrapMode: Text.WordWrap verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft