3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Render material spool somewhat bigger and give it a margin

Browse source 
The image of the spool doesn't have a margin by itself, contrary to the other images which have a visual margin given by the size of the table. We have to give it a margin manually. This is one of the consequences of encoding margins inside of images that may be used all over the place. We can't just remove the margins inside of the image because the laptop image will be used in other places too.
Just adding a margin would subtract from the size of the spool image making it very small. To compensate I'm making the spool image slightly bigger.

Contributes to issue CURA-8609.
This commit is contained in:
Ghostkeeper 2021-10-04 18:09:47 +02:00
parent 346d9f1db2
commit e56076af08
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
1 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

30
resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
View file

@ -47,20 +47,32 @@ Window
}
Row
{
/*
This is a row with 3 images, and a dashed line between each of them.
The images have various sizes, scaled to the window size:
- The computer screen and 3D printer have 1/3rd of the window size each.
- The remaining space is 2/3rds filled with the material spool image (so 2/9th in total).
- The remaining remaining space is divided equally over the two dashed lines (so 1/9th in total, or 1/18th per line).
*/
width: parent.width
height: parent.height * 2 / 3
Image
Item
{
id: spool_image
source: UM.Theme.getImage("material_spool")
width: Math.round(parent.width / 6)
anchors.bottom: parent.bottom
fillMode: Image.PreserveAspectFit
sourceSize.width: width
width: Math.round(parent.width * 2 / 9)
height: parent.height
Image
{
id: spool_image
source: UM.Theme.getImage("material_spool")
width: parent.width - UM.Theme.getSize("default_margin").width
anchors.bottom: parent.bottom
fillMode: Image.PreserveAspectFit
sourceSize.width: width
}
}
Canvas
{
width: Math.round(parent.width / 12)
width: Math.round(parent.width / 18)
height: UM.Theme.getSize("thick_lining").width
onPaint: {
var ctx = getContext("2d");
@ -84,7 +96,7 @@ Window
}
Canvas
{
width: Math.round(parent.width / 12)
width: Math.round(parent.width / 18)
height: UM.Theme.getSize("thick_lining").width
onPaint: {
var ctx = getContext("2d");