From ab542c3599e180a09abaac2b2773d679dde51c21 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Wed, 18 Feb 2015 12:21:06 -0800 Subject: [PATCH] Update DPI scaling to not update default fonts --- interface/src/ui/PreferencesDialog.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp index caab326f90..56a6e33bc2 100644 --- a/interface/src/ui/PreferencesDialog.cpp +++ b/interface/src/ui/PreferencesDialog.cpp @@ -35,8 +35,10 @@ void scaleWidgetFontSizes(QWidget* widget, float scale) { } QFont font = widget->font(); qDebug() << "Pref: " << widget->objectName() << ": " << font.pointSizeF(); - font.setPointSizeF(font.pointSizeF() * scale); - widget->setFont(font); + if (font != QFont()) { + font.setPointSizeF(font.pointSizeF() * scale); + widget->setFont(font); + } } PreferencesDialog::PreferencesDialog(QWidget* parent) : @@ -61,9 +63,11 @@ PreferencesDialog::PreferencesDialog(QWidget* parent) : setFixedHeight(parentWidget()->size().height() - PREFERENCES_HEIGHT_PADDING); auto glCanvas = DependencyManager::get(); + + // All font sizes are based on 72 DPI. float dpiScale = 72.0f / glCanvas->logicalDpiX(); - scaleWidgetFontSizes(ui.scrollArea, dpiScale); + scaleWidgetFontSizes(this, dpiScale); }