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

8
subsurface-helper.cpp
View file

@ -69,7 +69,7 @@ void exit_ui()
}
#ifdef SUBSURFACE_MOBILE
void run_mobile_ui()
void run_mobile_ui(double initial_font_size)
{
#if defined(Q_OS_ANDROID)
// work around an odd interaction between the OnePlus flavor of Android and Qt font handling
@ -127,9 +127,13 @@ void run_mobile_ui()
ctxt->setContextProperty("diveModel", MobileModels::instance()->listModel());
set_non_bt_addresses();
// we need to setup the initial font size before the QML UI is instantiated
ThemeInterface *themeInterface = ThemeInterface::instance();
themeInterface->setInitialFontSize(initial_font_size);
ctxt->setContextProperty("connectionListModel", &connectionListModel);
ctxt->setContextProperty("logModel", MessageHandlerModel::self());
ctxt->setContextProperty("subsurfaceTheme", ThemeInterface::instance());
ctxt->setContextProperty("subsurfaceTheme", themeInterface);
qmlRegisterUncreatableType<QMLManager>("org.subsurfacedivelog.mobile",1,0,"ExportType","Enum is not a type");