mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

mobile-widgets: move font property to themeInterface

Browse source 
Move setting of font properties used throughout to themeInterface.
Add new settings "currentScale".

The properties are kept in main (subsurfaceTheme) in order not to do
a big search/replace.

Update settings to use currectScale and signal changes in themeinterface.

Signed-off-by: jan Iversen <jan@casacondor.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
jan Iversen 2020-01-14 19:30:47 +01:00 • committed by Dirk Hohndel
parent a3e3a30b70
commit 2cc215d3f2
4 changed files with 59 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
mobile-widgets/qml/Settings.qml
View file

@ -315,26 +315,23 @@ Kirigami.ScrollablePage {
spacing: Kirigami.Units.largeSpacing
SsrfButton {
text: qsTr("smaller")
enabled: subsurfaceTheme.currentScale !== 0.85
enabled: ThemeNew.currentScale !== 0.85
onClicked: {
PrefDisplay.mobile_scale = 0.85
fontMetrics.font.pointSize = themeNew.basePointSize * PrefDisplay.mobile_scale;
ThemeNew.currentScale = 0.85
}
}
SsrfButton {
text: qsTr("regular")
enabled: subsurfaceTheme.currentScale !== 1.0
enabled: ThemeNew.currentScale !== 1.0
onClicked: {
PrefDisplay.mobile_scale = 1.0
fontMetrics.font.pointSize = themeNew.basePointSize * PrefDisplay.mobile_scale;
ThemeNew.currentScale = 1.0
}
}
SsrfButton {
text: qsTr("larger")
enabled: subsurfaceTheme.currentScale !== 1.15
enabled: ThemeNew.currentScale !== 1.15
onClicked: {
PrefDisplay.mobile_scale = 1.15
fontMetrics.font.pointSize = themeNew.basePointSize * PrefDisplay.mobile_scale;
ThemeNew.currentScale = 1.15
}
}
}

8
mobile-widgets/qml/main.qml
View file

@ -596,10 +596,10 @@ if you have network connectivity and want to sync your data to cloud storage."),
QtObject {
id: subsurfaceTheme
property double regularPointSize: fontMetrics.font.pointSize
property double titlePointSize: regularPointSize * 1.5
property double headingPointSize: regularPointSize * 1.2
property double smallPointSize: regularPointSize * 0.8
property double regularPointSize: ThemeNew.regularPointSize
property double titlePointSize: ThemeNew.titlePointSize
property double headingPointSize: ThemeNew.headingPointSize
property double smallPointSize: ThemeNew.smallPointSize
// colors currently in use
property color darkerPrimaryColor: ThemeNew.darkerPrimaryColor