diff --git a/forms/aboutporymap.ui b/forms/aboutporymap.ui index fc777020..da6ff09c 100644 --- a/forms/aboutporymap.ui +++ b/forms/aboutporymap.ui @@ -16,15 +16,6 @@ - - - Arial - 22 - true - false - true - - Porymap @@ -44,12 +35,6 @@ 0 - - - Arial - 12 - - Qt::AlignmentFlag::AlignCenter @@ -60,11 +45,6 @@ - - - Arial - - Map editor for pokeemerald, pokefirered and pokeruby. diff --git a/forms/colorpicker.ui b/forms/colorpicker.ui index a8cafe93..809393e8 100644 --- a/forms/colorpicker.ui +++ b/forms/colorpicker.ui @@ -169,11 +169,6 @@ - - - Courier - - RGB (000, 000, 000) @@ -181,11 +176,6 @@ - - - Courier - - #FFFFFF @@ -199,11 +189,6 @@ - - - Courier - - press [SPACE] to capture color diff --git a/src/ui/aboutporymap.cpp b/src/ui/aboutporymap.cpp index 2f7246c0..a456b010 100644 --- a/src/ui/aboutporymap.cpp +++ b/src/ui/aboutporymap.cpp @@ -8,6 +8,11 @@ AboutPorymap::AboutPorymap(QWidget *parent) : ui->setupUi(this); setAttribute(Qt::WA_DeleteOnClose); + // Set font in the stylesheet as opposed to the form so that it won't be overwritten by custom user fonts. + setStyleSheet("QLabel { font-family: \"Arial\"; }" + "QLabel#label_Title { font-size: 22pt; font-weight: bold; } " + "QLabel#label_Version { font-size: 12pt; }"); + this->ui->label_Version->setText(getVersionString()); layout()->setSizeConstraint(QLayout::SetFixedSize); diff --git a/src/ui/colorpicker.cpp b/src/ui/colorpicker.cpp index 6967c59a..a3cfe524 100644 --- a/src/ui/colorpicker.cpp +++ b/src/ui/colorpicker.cpp @@ -13,6 +13,8 @@ ColorPicker::ColorPicker(QWidget *parent) : this->scene = new QGraphicsScene; + setStyleSheet("QLabel#label_RGB, QLabel#label_HEX { font-family: \"Courier\"; }"); + // listen for spacebar press to take color QShortcut *takeColor = new QShortcut(Qt::Key_Space, this); QObject::connect(takeColor, &QShortcut::activated, [this](){