3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Correcter font sizes according to design

Browse source 
Contributes to issue CURA-8561.
This commit is contained in:
Ghostkeeper 2021-11-09 17:45:44 +01:00
parent d526e3be8c
commit d186912596
No known key found for this signature in database
GPG key ID: 68F39EA88EEED5FF
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/Marketplace/resources/qml/PackageCard.qml
View file

@ -92,7 +92,7 @@ Rectangle
Layout.alignment: Qt.AlignTop Layout.alignment: Qt.AlignTop
text: packageData.packageVersion text: packageData.packageVersion
font: UM.Theme.getFont("small") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
} }
@ -121,7 +121,7 @@ Rectangle
property real lastLineWidth: 0; //Store the width of the last line, to properly position the elision. property real lastLineWidth: 0; //Store the width of the last line, to properly position the elision.
text: packageData.description text: packageData.description
font: UM.Theme.getFont("default") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
maximumLineCount: 2 maximumLineCount: 2
wrapMode: Text.Wrap wrapMode: Text.Wrap
@ -131,7 +131,7 @@ Rectangle
{ {
if(truncated && line.isLast) if(truncated && line.isLast)
{ {
let max_line_width = parent.width - readMoreButton.width - fontMetrics.advanceWidth("… "); let max_line_width = parent.width - readMoreButton.width - fontMetrics.advanceWidth("… ") - UM.Theme.getSize("default_margin").width;
if(line.implicitWidth > max_line_width) if(line.implicitWidth > max_line_width)
{ {
line.width = max_line_width; line.width = max_line_width;
@ -232,6 +232,6 @@ Rectangle
FontMetrics FontMetrics
{ {
id: fontMetrics id: fontMetrics
font: UM.Theme.getFont("default") font: UM.Theme.getFont("medium")
} }
} }