diff options
| author |  jan Iversen <jan@casacondor.com> | 2020-01-14 19:30:47 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-01-30 07:52:14 +0200 |
| commit | 2cc215d3f26788974b1d5c552cb3750ad6bf8d85 (patch) | |
| tree | 7e49e4fa1cfaa9db7c609f4131f9b5f2d1816ea6 /mobile-widgets/qml | |
| parent | a3e3a30b701370ec8e35f5cb3d1072642a2f44b1 (diff) | |
| download | subsurface-2cc215d3f26788974b1d5c552cb3750ad6bf8d85.tar.gz | |
mobile-widgets: move font property to themeInterface
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>
Diffstat (limited to 'mobile-widgets/qml')
| -rw-r--r-- | mobile-widgets/qml/Settings.qml | 15 | ||||
| -rw-r--r-- | mobile-widgets/qml/main.qml | 8 |
2 files changed, 10 insertions, 13 deletions
diff --git a/mobile-widgets/qml/Settings.qml b/mobile-widgets/qml/Settings.qml index f4bc95db3..cc2034bc9 100644 --- a/mobile-widgets/qml/Settings.qml +++ b/mobile-widgets/qml/Settings.qml @@ -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 } } } diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml index ab9248ddf..be6cfaff2 100644 --- a/mobile-widgets/qml/main.qml +++ b/mobile-widgets/qml/main.qml @@ -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 |