diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2014-03-21 18:56:10 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-03-21 21:30:39 -0700 |
| commit | 9cfc585563ac584b792e8f1a5836ccfd75a3739d (patch) | |
| tree | da8d3605c4828993e1d23e360a131ffa72892120 /qt-ui | |
| parent | 41209005c949a65b3f3adb733ebda052e36980f4 (diff) | |
| download | subsurface-9cfc585563ac584b792e8f1a5836ccfd75a3739d.tar.gz | |
Fix system default font handling
We didn't care about system default fonts and sizes, we just used the Qt
default font.
Due to how QFont is constructed, there was need to split font and font
size.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui')
| -rw-r--r-- | qt-ui/mainwindow.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 8fd51a5b9..e77fa6b2c 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -645,8 +645,9 @@ void MainWindow::readSettings() { QSettings s; s.beginGroup("Display"); - QFont defaultFont = s.value("divelist_font", qApp->font()).value<QFont>(); - defaultFont.setPointSizeF(s.value("font_size", qApp->font().pointSizeF()).toFloat()); + QFont defaultFont = QFont(default_prefs.divelist_font); + defaultFont = s.value("divelist_font", defaultFont).value<QFont>(); + defaultFont.setPointSizeF(s.value("font_size", default_prefs.font_size).toFloat()); qApp->setFont(defaultFont); s.endGroup(); |