qt: Move font-size settings from css to c++.

This also keeps track of changed font-sizes and updates them depending on the settings if GUIUtil::updateFonts() gets called.

Author: xdustinface

src/qt/addressbookpage.cpp

@@ -143,6 +143,8 @@ AddressBookPage::AddressBookPage(const PlatformStyle *platformStyle, Mode _mode,
     connect(ui->tableView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextualMenu(QPoint)));
 
     connect(ui->closeButton, SIGNAL(clicked()), this, SLOT(accept()));
+
+    GUIUtil::updateFonts();
 }
 
 AddressBookPage::~AddressBookPage()

src/qt/askpassphrasedialog.cpp

@@ -31,6 +31,8 @@ AskPassphraseDialog::AskPassphraseDialog(Mode _mode, QWidget *parent) :
 
     GUIUtil::setFont({ui->capsLabel}, GUIUtil::getFontWeightBold());
 
+    GUIUtil::updateFonts();
+
     GUIUtil::disableMacFocusRect(this);
 
     ui->passEdit1->setMinimumSize(ui->passEdit1->sizeHint());

src/qt/bitcoingui.cpp

@@ -396,6 +396,9 @@ void BitcoinGUI::createActions()
     connect(historyAction, SIGNAL(clicked()), this, SLOT(showNormalIfMinimized()));
     connect(historyAction, SIGNAL(clicked()), this, SLOT(gotoHistoryPage()));
 
+    for (auto button : tabGroup->buttons()) {
+        GUIUtil::setFont({button}, GUIUtil::getFontWeightNormal(), 16);
+    }
     // Give the selected tab button a bolder font.
     connect(tabGroup, SIGNAL(buttonToggled(QAbstractButton *, bool)), this, SLOT(highlightTabButton(QAbstractButton *, bool)));
 #endif // ENABLE_WALLET
@@ -924,7 +927,7 @@ void BitcoinGUI::openClicked()
 
 void BitcoinGUI::highlightTabButton(QAbstractButton *button, bool checked)
 {
-    GUIUtil::setFont({button}, checked ? GUIUtil::getFontWeightBold() : GUIUtil::getFontWeightNormal());
+    GUIUtil::setFont({button}, checked ? GUIUtil::getFontWeightBold() : GUIUtil::getFontWeightNormal(), 16);
 }
 
 void BitcoinGUI::gotoOverviewPage()

src/qt/coincontroldialog.cpp

@@ -60,6 +60,8 @@ CoinControlDialog::CoinControlDialog(const PlatformStyle *_platformStyle, QWidge
                       ui->labelCoinControlChangeText
                      }, GUIUtil::getFontWeightBold());
 
+    GUIUtil::updateFonts();
+
     GUIUtil::disableMacFocusRect(this);
 
     // context menu actions

src/qt/guiutil.cpp

@@ -129,6 +129,8 @@ int fontScale = defaultFontScale;
 static std::map<QWidget*, std::pair<QFont::Weight, bool>> mapNormalFontUpdates;
 // Contains all widgets where a fixed pitch font has been set with GUIUtil::setFixedPitchFont
 static std::set<QWidget*> setFixedPitchFontUpdates;
+// Contains all widgets where a non-default fontsize has been seet with GUIUtil::setFont
+static std::map<QWidget*, int> mapFontSizeUpdates;
 #ifdef Q_OS_MAC
 // Contains all widgets where the macOS focus rect has been disabled.
 static std::set<QWidget*> setRectsDisabled;
@@ -1287,15 +1289,21 @@ void setApplicationFont()
                 " match: " << qApp->font().exactMatch();
 }
 
-void setFont(const std::vector<QWidget*> &vecWidgets, QFont::Weight weight, bool fItalic)
+void setFont(const std::vector<QWidget*> &vecWidgets, QFont::Weight weight, int nPointSize, bool fItalic)
 {
     // TODO: Evaluate maybe wrapping this later into some "theme handler" or so..
-    QFont font = getFont(weight, fItalic);
+    QFont font = getFont(weight, fItalic, nPointSize);
 
     for (auto it : vecWidgets) {
         auto fontAttributes = std::make_pair(weight, fItalic);
         auto itw = mapNormalFontUpdates.emplace(std::make_pair(it, fontAttributes));
         if (!itw.second) itw.first->second = fontAttributes;
+
+        if (nPointSize != -1) {
+            auto its = mapFontSizeUpdates.emplace(std::make_pair(it, nPointSize));
+            if (!its.second) its.first->second = nPointSize;
+        }
+
         it->setFont(font);
     }
 }
@@ -1314,6 +1322,13 @@ void updateFonts()
     // TODO: Evaluate maybe wrapping this later into some "theme handler" or so..
     setApplicationFont();
 
+    auto getKey = [](QWidget* w) -> QString
+    {
+        return w->parent() ? w->parent()->objectName() + w->objectName() :
+                             w->objectName();
+    };
+
+    static std::map<QString, int> mapDefaultFontSizes;
     std::map<QWidget*, QFont> mapWidgetFonts;
 
     for (QWidget* w : qApp->allWidgets()) {
@@ -1322,22 +1337,41 @@ void updateFonts()
         font.setWeight(qApp->font().weight());
         font.setStyleName(qApp->font().styleName());
         font.setStyle(qApp->font().style());
+        // Set the font size based on the widgets default font size + the font scale
+        QString key = getKey(w);
+        if (!mapDefaultFontSizes.count(key)) {
+            mapDefaultFontSizes.emplace(std::make_pair(key, font.pointSize() > 0 ? font.pointSize() : defaultFontSize));
+        }
+        font.setPointSizeF(getScaledFontSize(mapDefaultFontSizes[key]));
         mapWidgetFonts.emplace(w, font);
     }
 
     auto itn = mapNormalFontUpdates.begin();
     while (itn != mapNormalFontUpdates.end()) {
         if (mapWidgetFonts.count(itn->first)) {
-            mapWidgetFonts[itn->first] = getFont(itn->second.first, itn->second.second);
+            mapWidgetFonts[itn->first] = getFont(itn->second.first, itn->second.second, mapDefaultFontSizes[getKey(itn->first)]);
             ++itn;
         } else {
             itn = mapNormalFontUpdates.erase(itn);
         }
     }
+    auto its = mapFontSizeUpdates.begin();
+    while (its != mapFontSizeUpdates.end()) {
+        if (mapWidgetFonts.count(its->first)) {
+            QFont font = mapWidgetFonts[its->first];
+            font.setPointSizeF(getScaledFontSize(its->second));
+            mapWidgetFonts[its->first] = font;
+            ++its;
+        } else {
+            its = mapFontSizeUpdates.erase(its);
+        }
+    }
     auto itf = setFixedPitchFontUpdates.begin();
     while (itf != setFixedPitchFontUpdates.end()) {
         if (mapWidgetFonts.count(*itf)) {
-            mapWidgetFonts[*itf] = fixedPitchFont();
+            QFont font = fixedPitchFont();
+            font.setPointSizeF(getScaledFontSize(mapDefaultFontSizes[getKey(*itf)]));
+            mapWidgetFonts[*itf] = font;
             ++itf;
         } else {
             itf = setFixedPitchFontUpdates.erase(itf);
@@ -1346,10 +1380,13 @@ void updateFonts()
 
     for (auto it: mapWidgetFonts) {
         it.first->setFont(it.second);
+        if (gArgs.IsArgSet("-debug-ui")) {
+            qDebug() << __func__ << ": set font " << it.second << " for widget " << it.first->objectName();
+        }
     }
 }
 
-QFont getFont(QFont::Weight weight, bool fItalic)
+QFont getFont(QFont::Weight weight, bool fItalic, int nPointSize)
 {
     // TODO: Evaluate maybe wrapping this later into some "theme handler" or so..
     QFont font;
@@ -1398,6 +1435,11 @@ QFont getFont(QFont::Weight weight, bool fItalic)
         font.setWeight(weight > QFont::Normal ? QFont::Bold : QFont::Normal);
         font.setStyle(fItalic ? QFont::StyleItalic : QFont::StyleNormal);
     }
+
+    if (nPointSize != -1) {
+        font.setPointSizeF(getScaledFontSize(nPointSize));
+    }
+
     if (gArgs.IsArgSet("-debug-ui")) {
         qDebug() << __func__ << ": font size: " << font.pointSizeF() << " family: " << font.family() << ", style: " << font.styleName() << " match: " << font.exactMatch();
     }

src/qt/masternodelist.cpp

@@ -45,7 +45,8 @@ MasternodeList::MasternodeList(const PlatformStyle* platformStyle, QWidget* pare
 
     GUIUtil::setFont({ui->label_count_2,
                       ui->countLabelDIP3
-                     }, GUIUtil::getFontWeightBold());
+                     }, GUIUtil::getFontWeightBold(), 14);
+    GUIUtil::setFont({ui->label_filter_2}, GUIUtil::getFontWeightNormal(), 15);
 
     int columnAddressWidth = 200;
     int columnStatusWidth = 80;

src/qt/openuridialog.cpp

@@ -16,6 +16,7 @@ OpenURIDialog::OpenURIDialog(QWidget *parent) :
     ui(new Ui::OpenURIDialog)
 {
     ui->setupUi(this);
+    GUIUtil::updateFonts();
     GUIUtil::disableMacFocusRect(this);
     ui->uriEdit->setPlaceholderText("dash:");
 }

src/qt/optionsdialog.cpp

@@ -39,7 +39,9 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
 
     previousTheme = GUIUtil::getActiveTheme();
 
-    GUIUtil::setFont({ui->statusLabel}, GUIUtil::getFontWeightBold());
+    GUIUtil::setFont({ui->statusLabel}, GUIUtil::getFontWeightBold(), 16);
+
+    GUIUtil::updateFonts();
 
     GUIUtil::disableMacFocusRect(this);
 
@@ -252,8 +254,8 @@ void OptionsDialog::showPage(int index)
         }
     }
 
-    GUIUtil::setFont({btnActive}, GUIUtil::getFontWeightBold());
-    GUIUtil::setFont(vecNormal, GUIUtil::getFontWeightNormal());
+    GUIUtil::setFont({btnActive}, GUIUtil::getFontWeightBold(), 16);
+    GUIUtil::setFont(vecNormal, GUIUtil::getFontWeightNormal(), 16);
 
     ui->stackedWidgetOptions->setCurrentIndex(index);
     btnActive->setChecked(true);

src/qt/overviewpage.cpp

@@ -137,16 +137,19 @@ OverviewPage::OverviewPage(const PlatformStyle *platformStyle, QWidget *parent)
 
     GUIUtil::setFont({ui->label_4,
                       ui->label_5,
-                      ui->labelWatchPending,
-                      ui->labelUnconfirmed,
-                      ui->labelWatchImmature,
-                      ui->labelImmature,
-                      ui->labelTotal,
+                      ui->labelPrivateSendHeader
+                     }, GUIUtil::getFontWeightBold(), 16);
+
+    GUIUtil::setFont({ui->labelTotalText,
                       ui->labelWatchTotal,
-                      ui->labelWatchAvailable,
-                      ui->labelBalance,
-                      ui->labelPrivateSendHeader,
-                      ui->labelAnonymized
+                      ui->labelTotal
+                     }, GUIUtil::getFontWeightBold(), 14);
+
+    GUIUtil::setFont({ui->labelBalanceText,
+                      ui->labelPendingText,
+                      ui->labelImmatureText,
+                      ui->labelWatchonly,
+                      ui->labelSpendable
                      }, GUIUtil::getFontWeightBold());
 
     // Recent transactions

src/qt/qrdialog.cpp

@@ -97,7 +97,9 @@ QRDialog::QRDialog(QWidget *parent) :
 {
     ui->setupUi(this);
 
-    GUIUtil::setFont({ui->labelQRCodeTitle}, GUIUtil::getFontWeightBold());
+    GUIUtil::setFont({ui->labelQRCodeTitle}, GUIUtil::getFontWeightBold(), 16);
+
+    GUIUtil::updateFonts();
 
 #ifndef USE_QRCODE
     ui->button_saveImage->setVisible(false);