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/UI: remember the system default font size

Browse source 
We need to do this before the preferences are loaded, or the system
default size is lost. Given that our other sizes are all relative to
this value, that would be a problem.

With this we can now ensure that we always have the right font size for
smaller, regular, and larger theme settings.

Also removes some obsolete commented out code.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2021-01-14 17:08:13 -08:00
parent 1472117541
commit 323e97c603
6 changed files with 37 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

45
mobile-widgets/themeinterface.cpp
View file

@ -56,13 +56,7 @@ ThemeInterface::ThemeInterface()
// get current theme
m_currentTheme = qPrefDisplay::theme();
update_theme();
// check system font and create QFontInfo in order to reliably get the point size
QFontInfo qfi(defaultModelFont());
m_basePointSize = qfi.pointSize();
// set initial font size
set_currentScale(qPrefDisplay::mobile_scale());
m_basePointSize = -1.0; // simply a placeholder to declare 'this isn't set, yet'
}
void ThemeInterface::set_currentTheme(const QString &theme)
@ -73,6 +67,12 @@ void ThemeInterface::set_currentTheme(const QString &theme)
emit currentThemeChanged();
}
void ThemeInterface::setInitialFontSize(double fontSize)
{
m_basePointSize = fontSize;
set_currentScale(qPrefDisplay::mobile_scale());
}
double ThemeInterface::currentScale()
{
return qPrefDisplay::mobile_scale();
@ -80,27 +80,30 @@ double ThemeInterface::currentScale()
void ThemeInterface::set_currentScale(double newScale)
{
static bool needSignals = true; // make sure the signals fire the first time
if (!IS_FP_SAME(newScale, qPrefDisplay::mobile_scale())) {
double factor = newScale / qPrefDisplay::mobile_scale();
qPrefDisplay::set_mobile_scale(newScale);
emit currentScaleChanged();
// Set current font size
m_basePointSize *= factor;
defaultModelFont().setPointSizeF(m_basePointSize);
needSignals = true;
}
// adjust all used font sizes
m_regularPointSize = m_basePointSize;
emit regularPointSizeChanged();
if (needSignals) {
// adjust all used font sizes
m_regularPointSize = m_basePointSize * newScale;
defaultModelFont().setPointSizeF(m_regularPointSize);
emit regularPointSizeChanged();
m_headingPointSize = m_regularPointSize * 1.2;
emit headingPointSizeChanged();
m_headingPointSize = m_regularPointSize * 1.2;
emit headingPointSizeChanged();
m_smallPointSize = m_regularPointSize * 0.8;
emit smallPointSizeChanged();
m_smallPointSize = m_regularPointSize * 0.8;
emit smallPointSizeChanged();
m_titlePointSize = m_regularPointSize * 1.5;
emit titlePointSizeChanged();
m_titlePointSize = m_regularPointSize * 1.5;
emit titlePointSizeChanged();
needSignals = false;
}
}
void ThemeInterface::update_theme()