mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-11-02 20:52:20 -07:00
Don't stretch in height and adhere border to UX design
Contributes to CURA-8689
This commit is contained in:
parent
00bdd9d72c
commit
f0966b1c57
2 changed files with 7 additions and 3 deletions
|
|
@ -13,6 +13,7 @@ Control
|
|||
id: root
|
||||
property alias text: link_text.text
|
||||
property alias imageSource: image.source
|
||||
property alias borderHeight: background.height
|
||||
property var onClicked
|
||||
|
||||
states:
|
||||
|
|
@ -42,7 +43,6 @@ Control
|
|||
onClicked: root.onClicked && root.onClicked()
|
||||
}
|
||||
|
||||
topPadding: UM.Theme.getSize("wide_margin").height
|
||||
rightPadding: UM.Theme.getSize("wide_margin").width
|
||||
bottomPadding: UM.Theme.getSize("wide_margin").height
|
||||
leftPadding: UM.Theme.getSize("wide_margin").width
|
||||
|
|
@ -50,7 +50,8 @@ Control
|
|||
background: Rectangle
|
||||
{
|
||||
id: background
|
||||
anchors.fill: parent
|
||||
anchors.bottom: column.bottom
|
||||
height: parent.height
|
||||
border.color: UM.Theme.getColor("primary_button")
|
||||
color: "transparent"
|
||||
border.width: 1
|
||||
|
|
@ -59,6 +60,7 @@ Control
|
|||
|
||||
contentItem: ColumnLayout
|
||||
{
|
||||
id: column
|
||||
spacing: UM.Theme.getSize("wide_margin").height
|
||||
height: childrenRect.height
|
||||
width: childrenRect.width
|
||||
|
|
@ -68,7 +70,6 @@ Control
|
|||
id: image
|
||||
source: imageSource
|
||||
width: 180 * screenScaleFactor
|
||||
height: 180 * screenScaleFactor
|
||||
sourceSize.width: width
|
||||
sourceSize.height: height
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue