Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime van Kessel <nallath@gmail.com>2022-02-22 17:44:30 +0300
committerJaime van Kessel <nallath@gmail.com>2022-02-22 17:44:30 +0300
commita05650f64c03fc9df8cb4bfb3afa2ac00be48414 (patch)
tree8941d44dd3daac851e5e403a4e5a7d2ef04c2c03 /plugins/Marketplace/resources
parent0b39fb1c916861fbab9a1c21225449b29ff01751 (diff)
Fix margins for OnboardBanner
Re-usable components shouldn't really be setting layout themselves. This should be done by whomever creates them. The actual fix is that the banner no longe sets all margins, only left & right CURA-8726
Diffstat (limited to 'plugins/Marketplace/resources')
-rw-r--r--plugins/Marketplace/resources/qml/Marketplace.qml4
-rw-r--r--plugins/Marketplace/resources/qml/OnboardBanner.qml5
2 files changed, 5 insertions, 4 deletions
diff --git a/plugins/Marketplace/resources/qml/Marketplace.qml b/plugins/Marketplace/resources/qml/Marketplace.qml
index ebb3bd26a5..796c537640 100644
--- a/plugins/Marketplace/resources/qml/Marketplace.qml
+++ b/plugins/Marketplace/resources/qml/Marketplace.qml
@@ -92,6 +92,10 @@ Window
icon: content.item && content.item.bannerIcon
onRemove: content.item && content.item.onRemoveBanner
readMoreUrl: content.item && content.item.bannerReadMoreUrl
+
+ Layout.fillWidth: true
+ Layout.leftMargin: UM.Theme.getSize("default_margin").width
+ Layout.rightMargin: UM.Theme.getSize("default_margin").width
}
// Search & Top-Level Tabs
diff --git a/plugins/Marketplace/resources/qml/OnboardBanner.qml b/plugins/Marketplace/resources/qml/OnboardBanner.qml
index 25e4b53241..7d973cb74a 100644
--- a/plugins/Marketplace/resources/qml/OnboardBanner.qml
+++ b/plugins/Marketplace/resources/qml/OnboardBanner.qml
@@ -16,10 +16,7 @@ Rectangle
property var onRemove
property string readMoreUrl
- Layout.preferredHeight: childrenRect.height + 2 * UM.Theme.getSize("default_margin").height
- Layout.fillWidth: true
- Layout.margins: UM.Theme.getSize("default_margin").width
-
+ implicitHeight: childrenRect.height + 2 * UM.Theme.getSize("default_margin").height
color: UM.Theme.getColor("action_panel_secondary")
// Icon