Commit 4dd4d3a3 authored by Nate Graham's avatar Nate Graham 🔩
Browse files

Use font: instead of font.pointSize: where possible

Summary:
Otherwise we're discarding style information possibly set in
the user's small font choices when we want to set a smaller
font.

Test Plan: Stuff that's suposta look small still looks small

Reviewers: cblack, #plasma

Reviewed By: cblack, #plasma

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D29438
parent 1eecde8b
......@@ -61,7 +61,7 @@ PlasmaComponents.TabButton {
horizontalAlignment: Text.AlignHCenter
elide: Text.ElideRight
wrapMode: Text.WordWrap
font.pointSize: theme.smallestFont.pointSize
font: theme.smallestFont
}
}
} // button
......@@ -54,7 +54,7 @@ PlasmaCore.FrameSvgItem {
horizontalAlignment: Text.AlignHCenter
elide: Text.ElideRight
color: PlasmaCore.ColorScope.textColor
font.pointSize: theme.smallestFont.pointSize
font: theme.smallestFont
}
}
}
......@@ -141,7 +141,7 @@ Item {
text: model.description || ""
opacity: isCurrent ? 0.8 : 0.6
font.pointSize: theme.smallestFont.pointSize
font: theme.smallestFont
elide: Text.ElideMiddle
horizontalAlignment: Text.AlignLeft
}
......
......@@ -281,7 +281,7 @@ ColumnLayout {
lineHeight: 1
elide: parent.state ? Text.ElideNone : Text.ElideRight
text: artist || ""
font.pointSize: theme.smallestFont.pointSize
font: theme.smallestFont
}
}
}
......
......@@ -153,7 +153,7 @@ PlasmaCore.Dialog {
PlasmaComponents.Label {
Layout.fillWidth: true
text: model.description
font.pointSize: theme.smallestFont.pointSize
font: theme.smallestFont
maximumLineCount: 2
wrapMode: Text.WordWrap
elide: Text.ElideRight
......
......@@ -223,7 +223,7 @@ Item {
// otherwise causes binding loop due to the way the Plasma sets the height
height: implicitHeight
text: model.description
font.pointSize: theme.smallestFont.pointSize
font: theme.smallestFont
wrapMode: Text.WordWrap
elide: Text.ElideRight
maximumLineCount: heading.lineCount === 1 ? 3 : 2
......
......@@ -132,7 +132,7 @@ KCM.SimpleKCM {
Layout.fillWidth: true
text: singleClick.checked ? i18n("Select by clicking on item's selection marker") : i18n("Select by single-clicking")
elide: Text.ElideRight
font.pointSize: theme.smallestFont.pointSize
font: theme.smallestFont
}
Item {
......@@ -171,7 +171,7 @@ KCM.SimpleKCM {
visible: scrollbarLeftClickNavigatesByPage.checked
text: i18n("Middle-click to scroll to clicked location")
elide: Text.ElideRight
font.pointSize: theme.smallestFont.pointSize
font: theme.smallestFont
}
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment