mirror of
https://github.com/subsurface/subsurface.git
synced 2025-01-31 17:33:24 +00:00
mobile/UI: correctly update title bar font size
Simply force it to use the default font, which is bound to the application font, which we SHOULD be updating when changing the regular font size for the app, anyway. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
f678be0374
commit
9be23b5f3f
2 changed files with 10 additions and 20 deletions
|
@ -5,26 +5,9 @@ Subject: [PATCH 05/11] breadcrumbs: get better font size
|
|||
|
||||
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
||||
---
|
||||
src/controls/Units.qml | 5 +++++
|
||||
src/controls/private/globaltoolbar/BreadcrumbControl.qml | 1 +
|
||||
2 files changed, 6 insertions(+)
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/controls/Units.qml b/src/controls/Units.qml
|
||||
index 615228a2..f957046f 100644
|
||||
--- a/src/controls/Units.qml
|
||||
+++ b/src/controls/Units.qml
|
||||
@@ -105,6 +105,11 @@ QtObject {
|
||||
*/
|
||||
readonly property int wheelScrollLines: 3
|
||||
|
||||
+ /**
|
||||
+ * Use this to hardcode the font size of the global toolbar that Kirigami gets wrong
|
||||
+ */
|
||||
+ property double defaultFontSize: fontMetrics.font.pixelSize
|
||||
+
|
||||
/**
|
||||
* metrics used by the default font
|
||||
*/
|
||||
diff --git a/src/controls/private/globaltoolbar/BreadcrumbControl.qml b/src/controls/private/globaltoolbar/BreadcrumbControl.qml
|
||||
index ad80d222..c45db280 100644
|
||||
--- a/src/controls/private/globaltoolbar/BreadcrumbControl.qml
|
||||
|
@ -33,7 +16,7 @@ index ad80d222..c45db280 100644
|
|||
}
|
||||
Kirigami.Heading {
|
||||
Layout.leftMargin: Kirigami.Units.largeSpacing
|
||||
+ font.pixelSize: Math.max(1, Kirigami.Units.defaultFontSize)
|
||||
+ font: Kirigami.Theme.defaultFont
|
||||
color: Kirigami.Theme.textColor
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
wrapMode: Text.NoWrap
|
||||
|
|
|
@ -665,9 +665,16 @@ if you have network connectivity and want to sync your data to cloud storage."),
|
|||
}
|
||||
}
|
||||
|
||||
property double regularFontsize: subsurfaceTheme.regularPointSize
|
||||
|
||||
FontMetrics {
|
||||
id: fontMetrics
|
||||
font.pointSize: subsurfaceTheme.regularPointSize
|
||||
font.pointSize: regularFontsize
|
||||
}
|
||||
|
||||
onRegularFontsizeChanged: {
|
||||
manager.appendTextToLog("regular font size changed to " + regularFontsize)
|
||||
rootItem.font.pointSize = regularFontsize
|
||||
}
|
||||
|
||||
function setupUnits() {
|
||||
|
|
Loading…
Add table
Reference in a new issue