From 1705273bb80be62fa4be8a36be57d295b8b0851c Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Thu, 21 Dec 2017 14:36:05 +0200 Subject: [PATCH] Fix font size inconsistencies --- include/Config.h | 6 +++++- src/RoomInfoListItem.cc | 2 +- src/dialogs/CreateRoom.cc | 14 ++++++++------ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/include/Config.h b/include/Config.h index 7cfc5358..781e910c 100644 --- a/include/Config.h +++ b/include/Config.h @@ -12,6 +12,10 @@ static constexpr int emojiSize = 14; static constexpr int headerFontSize = 21; static constexpr int typingNotificationFontSize = 11; +namespace dialogs { +static constexpr int labelSize = 15; +} + // Window geometry. namespace window { static constexpr int height = 600; @@ -39,7 +43,7 @@ static constexpr int cornerRadius = 3; // RoomList specific. namespace roomlist { namespace fonts { -static constexpr int heading = 15; +static constexpr int heading = 14; static constexpr int badge = 10; static constexpr int bubble = 20; } // namespace fonts diff --git a/src/RoomInfoListItem.cc b/src/RoomInfoListItem.cc index 41e9ea86..551895d6 100644 --- a/src/RoomInfoListItem.cc +++ b/src/RoomInfoListItem.cc @@ -148,7 +148,7 @@ RoomInfoListItem::paintEvent(QPaintEvent *event) if (width() > ui::sidebar::SmallSize) { font.setPixelSize(conf::roomlist::fonts::heading); - font.setWeight(68); + font.setWeight(60); p.setFont(font); p.setPen(titlePen); diff --git a/src/dialogs/CreateRoom.cc b/src/dialogs/CreateRoom.cc index c46636ab..2b2fd7f2 100644 --- a/src/dialogs/CreateRoom.cc +++ b/src/dialogs/CreateRoom.cc @@ -54,16 +54,18 @@ CreateRoom::CreateRoom(QWidget *parent) auto presetLayout = new QHBoxLayout; presetLayout->setContentsMargins(0, 10, 0, 10); - auto visibilityLabel = new QLabel(tr("Room visibility"), this); - visibilityCombo_ = new QComboBox(this); + auto visibilityLabel = new QLabel(tr("Room Visibility"), this); + visibilityLabel->setStyleSheet(QString("font-size: %1px;").arg(conf::dialogs::labelSize)); + visibilityCombo_ = new QComboBox(this); visibilityCombo_->addItem("Private"); visibilityCombo_->addItem("Public"); visibilityLayout->addWidget(visibilityLabel); visibilityLayout->addWidget(visibilityCombo_, 0, Qt::AlignBottom | Qt::AlignRight); - auto presetLabel = new QLabel(tr("Room preset"), this); - presetCombo_ = new QComboBox(this); + auto presetLabel = new QLabel(tr("Room Preset"), this); + presetLabel->setStyleSheet(QString("font-size: %1px;").arg(conf::dialogs::labelSize)); + presetCombo_ = new QComboBox(this); presetCombo_->addItem("Private Chat"); presetCombo_->addItem("Public Chat"); presetCombo_->addItem("Trusted Private Chat"); @@ -72,11 +74,11 @@ CreateRoom::CreateRoom(QWidget *parent) presetLayout->addWidget(presetCombo_, 0, Qt::AlignBottom | Qt::AlignRight); auto directLabel_ = new QLabel(tr("Direct Chat"), this); - directToggle_ = new Toggle(this); + directLabel_->setStyleSheet(QString("font-size: %1px;").arg(conf::dialogs::labelSize)); + directToggle_ = new Toggle(this); directToggle_->setActiveColor(QColor("#38A3D8")); directToggle_->setInactiveColor(QColor("gray")); directToggle_->setState(true); - directLabel_->setStyleSheet("font-size: 15px;"); auto directLayout = new QHBoxLayout; directLayout->setContentsMargins(0, 10, 0, 10);