GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-05 06:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add background to page content, and restructure margins

Browse Source 
To display the background across the entire bottom side and not with the margins of the column, we have to restructure where the margins are a bit.

Contributes to issue CURA-8556.
This commit is contained in:
Ghostkeeper 2021-10-21 16:35:54 +02:00
parent 38038b3752
commit b585c02207
No known key found for this signature in database
GPG Key ID: D2A8871EE34EC59A
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/Marketplace/resources/qml/Marketplace.qml
View File

@ -29,25 +29,43 @@ Window
ColumnLayout ColumnLayout
{ {
anchors.fill: parent anchors.fill: parent
anchors.margins: UM.Theme.getSize("default_margin").width
spacing: UM.Theme.getSize("default_margin").height spacing: UM.Theme.getSize("default_margin").height
Label //Page title. Item //Page title.
{ {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: contentHeight Layout.preferredHeight: childrenRect.height + UM.Theme.getSize("default_margin").height
font: UM.Theme.getFont("large") Label
color: UM.Theme.getColor("text") {
text: catalog.i18nc("@header", "Install Plugins") anchors
{
left: parent.left
leftMargin: UM.Theme.getSize("default_margin").width
right: parent.right
rightMargin: UM.Theme.getSize("default_margin").width
bottom: parent.bottom
}
font: UM.Theme.getFont("large")
color: UM.Theme.getColor("text")
text: catalog.i18nc("@header", "Install Plugins")
}
} }
Loader //Page contents. Rectangle //Page contents.
{ {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.fillHeight: true Layout.fillHeight: true
color: UM.Theme.getColor("detail_background")
source: "Plugins.qml" Loader //Page contents.
{
anchors.fill: parent
anchors.margins: UM.Theme.getSize("default_margin").width
source: "Plugins.qml"
}
} }
} }
} }

1
resources/themes/cura-light/theme.json
View File

@ -173,6 +173,7 @@
"colors": { "colors": {
"main_background": [255, 255, 255, 255], "main_background": [255, 255, 255, 255],
"detail_background": [243, 243, 243, 255],
"wide_lining": [245, 245, 245, 255], "wide_lining": [245, 245, 245, 255],
"thick_lining": [180, 180, 180, 255], "thick_lining": [180, 180, 180, 255],
"lining": [192, 193, 194, 255], "lining": [192, 193, 194, 255],