Skip to content

gui: Fix macOS and designer font sizes #2098

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamescowens merged 1 commit into from
Apr 11, 2021
Merged

gui: Fix macOS and designer font sizes #2098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/qt/bitcoingui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,18 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
QFontDatabase::addApplicationFont(":/fonts/inter-bold");
QFontDatabase::addApplicationFont(":/fonts/inter-regular");
QFontDatabase::addApplicationFont(":/fonts/inconsolata-regular");

#ifndef Q_OS_MAC
// This slightly enlarges the application's base font size on Windows and
// Linux. MacOS often uses a different reference DPI so this can actually
// cause the rendered text to appear smaller. On Mac, the default size is
// adequate.
//
QFont appFont = qApp->font();
appFont.setPointSize(10);
qApp->setFont(appFont);
#endif

setWindowTitle(tr("Gridcoin") + " " + tr("Wallet"));

#ifndef Q_OS_MAC
Expand Down
2 changes: 0 additions & 2 deletions src/qt/res/stylesheets/dark_stylesheet.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

* {
font-family: "Inter";
font-size: 10pt;
}


Expand Down Expand Up @@ -425,7 +424,6 @@ QTabBar::tab:!selected:hover {
/* RPC Console */
#messagesWidget, #lineEdit, #scraper_log {
font-family: "Inconsolata";
font-size: 10pt;
}

QGroupBox{
Expand Down
2 changes: 0 additions & 2 deletions src/qt/res/stylesheets/light_stylesheet.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

* {
font-family: "Inter";
font-size: 10pt;
}

QMainWindow {
Expand Down Expand Up @@ -425,7 +424,6 @@ QTabBar::tab:!selected:hover {
/* RPC Console */
#messagesWidget, #lineEdit, #scraper_log {
font-family: "Inconsolata";
font-size: 10pt;
}

QGroupBox{
Expand Down
2 changes: 0 additions & 2 deletions src/qt/res/stylesheets/native_stylesheet.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

* {
font-family: "Inter";
font-size: 10pt;
}

QMainWindow {
Expand Down Expand Up @@ -30,7 +29,6 @@ QTextEdit {
/* RPC Console */
#messagesWidget, #lineEdit, #scraper_log {
font-family: "Inconsolata";
font-size: 10pt;
}

/* Main Window*/
Expand Down