Remove un-needed column component

CURA-8587

1 files changed, 61 insertions, 69 deletions

diff --git a/plugins/Marketplace/resources/qml/PackageCard.qml b/plugins/Marketplace/resources/qml/PackageCard.qml
index 9097417c80..633d2b25b9 100644
--- a/plugins/Marketplace/resources/qml/PackageCard.qml
+++ b/plugins/Marketplace/resources/qml/PackageCard.qml
@@ -17,86 +17,78 @@ Rectangle
     color: UM.Theme.getColor("main_background")
     radius: UM.Theme.getSize("default_radius").width
 
-    Column
+    PackageCardHeader
     {
-        width: parent.width
+        id: packageCardHeader
 
-        spacing: 0
-
-        PackageCardHeader
+        Item
         {
-            id: packageCardHeader
-
-                // description
-            Item
-            {
-                id: shortDescription
+            id: shortDescription
 
-                anchors.fill: parent
+            anchors.fill: parent
 
-                Label
+            Label
+            {
+                id: descriptionLabel
+                width: parent.width
+                property real lastLineWidth: 0; //Store the width of the last line, to properly position the elision.
+
+                text: packageData.description
+                textFormat: Text.PlainText //Must be plain text, or we won't get onLineLaidOut signals. Don't auto-detect!
+                font: UM.Theme.getFont("default")
+                color: UM.Theme.getColor("text")
+                maximumLineCount: 2
+                wrapMode: Text.Wrap
+                elide: Text.ElideRight
+                visible: text !== ""
+
+                onLineLaidOut:
                 {
-                    id: descriptionLabel
-                    width: parent.width
-                    property real lastLineWidth: 0; //Store the width of the last line, to properly position the elision.
-
-                    text: packageData.description
-                    textFormat: Text.PlainText //Must be plain text, or we won't get onLineLaidOut signals. Don't auto-detect!
-                    font: UM.Theme.getFont("default")
-                    color: UM.Theme.getColor("text")
-                    maximumLineCount: 2
-                    wrapMode: Text.Wrap
-                    elide: Text.ElideRight
-                    visible: text !== ""
-
-                    onLineLaidOut:
+                    if(truncated && line.isLast)
                     {
-                        if(truncated && line.isLast)
+                        let max_line_width = parent.width - readMoreButton.width - fontMetrics.advanceWidth("… ") - 2 * UM.Theme.getSize("default_margin").width;
+                        if(line.implicitWidth > max_line_width)
+                        {
+                            line.width = max_line_width;
+                        }
+                        else
                         {
-                            let max_line_width = parent.width - readMoreButton.width - fontMetrics.advanceWidth("… ") - 2 * UM.Theme.getSize("default_margin").width;
-                            if(line.implicitWidth > max_line_width)
-                            {
-                                line.width = max_line_width;
-                            }
-                            else
-                            {
-                                line.width = line.implicitWidth - fontMetrics.advanceWidth("…"); //Truncate the ellipsis. We're adding this ourselves.
-                            }
-                            descriptionLabel.lastLineWidth = line.implicitWidth;
+                            line.width = line.implicitWidth - fontMetrics.advanceWidth("…"); //Truncate the ellipsis. We're adding this ourselves.
                         }
+                        descriptionLabel.lastLineWidth = line.implicitWidth;
                     }
                 }
-                Label
-                {
-                    id: tripleDotLabel
-                    anchors.left: parent.left
-                    anchors.leftMargin: descriptionLabel.lastLineWidth
-                    anchors.bottom: descriptionLabel.bottom
-
-                    text: "… "
-                    font: descriptionLabel.font
-                    color: descriptionLabel.color
-                    visible: descriptionLabel.truncated && descriptionLabel.text !== ""
-                }
-                Cura.TertiaryButton
-                {
-                    id: readMoreButton
-                    anchors.right: parent.right
-                    anchors.bottom: descriptionLabel.bottom
-                    height: fontMetrics.height //Height of a single line.
-
-                    text: catalog.i18nc("@info", "Read more")
-                    iconSource: UM.Theme.getIcon("LinkExternal")
-
-                    visible: descriptionLabel.truncated && descriptionLabel.text !== ""
-                    enabled: visible
-                    leftPadding: UM.Theme.getSize("default_margin").width
-                    rightPadding: UM.Theme.getSize("wide_margin").width
-                    textFont: descriptionLabel.font
-                    isIconOnRightSide: true
-
-                    onClicked: Qt.openUrlExternally(packageData.packageInfoUrl)
-                }
+            }
+            Label
+            {
+                id: tripleDotLabel
+                anchors.left: parent.left
+                anchors.leftMargin: descriptionLabel.lastLineWidth
+                anchors.bottom: descriptionLabel.bottom
+
+                text: "… "
+                font: descriptionLabel.font
+                color: descriptionLabel.color
+                visible: descriptionLabel.truncated && descriptionLabel.text !== ""
+            }
+            Cura.TertiaryButton
+            {
+                id: readMoreButton
+                anchors.right: parent.right
+                anchors.bottom: descriptionLabel.bottom
+                height: fontMetrics.height //Height of a single line.
+
+                text: catalog.i18nc("@info", "Read more")
+                iconSource: UM.Theme.getIcon("LinkExternal")
+
+                visible: descriptionLabel.truncated && descriptionLabel.text !== ""
+                enabled: visible
+                leftPadding: UM.Theme.getSize("default_margin").width
+                rightPadding: UM.Theme.getSize("wide_margin").width
+                textFont: descriptionLabel.font
+                isIconOnRightSide: true
+
+                onClicked: Qt.openUrlExternally(packageData.packageInfoUrl)
             }
         }
     }