d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix font size inconsistencies

Browse source
This commit is contained in:
Konstantinos Sideris 2017-12-21 14:36:05 +02:00
parent 94b2827051
commit 1705273bb8
3 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/Config.h
View file

@ -12,6 +12,10 @@ static constexpr int emojiSize = 14;
static constexpr int headerFontSize = 21; static constexpr int headerFontSize = 21;
static constexpr int typingNotificationFontSize = 11; static constexpr int typingNotificationFontSize = 11;
namespace dialogs {
static constexpr int labelSize = 15;
}
// Window geometry. // Window geometry.
namespace window { namespace window {
static constexpr int height = 600; static constexpr int height = 600;
@ -39,7 +43,7 @@ static constexpr int cornerRadius = 3;
// RoomList specific. // RoomList specific.
namespace roomlist { namespace roomlist {
namespace fonts { namespace fonts {
static constexpr int heading = 15; static constexpr int heading = 14;
static constexpr int badge = 10; static constexpr int badge = 10;
static constexpr int bubble = 20; static constexpr int bubble = 20;
} // namespace fonts } // namespace fonts

2
src/RoomInfoListItem.cc
View file

@ -148,7 +148,7 @@ RoomInfoListItem::paintEvent(QPaintEvent *event)
if (width() > ui::sidebar::SmallSize) { if (width() > ui::sidebar::SmallSize) {
font.setPixelSize(conf::roomlist::fonts::heading); font.setPixelSize(conf::roomlist::fonts::heading);
font.setWeight(68); font.setWeight(60);
p.setFont(font); p.setFont(font);
p.setPen(titlePen); p.setPen(titlePen);

14
src/dialogs/CreateRoom.cc
View file

@ -54,16 +54,18 @@ CreateRoom::CreateRoom(QWidget *parent)
auto presetLayout = new QHBoxLayout; auto presetLayout = new QHBoxLayout;
presetLayout->setContentsMargins(0, 10, 0, 10); presetLayout->setContentsMargins(0, 10, 0, 10);
auto visibilityLabel = new QLabel(tr("Room visibility"), this); auto visibilityLabel = new QLabel(tr("Room Visibility"), this);
visibilityCombo_ = new QComboBox(this); visibilityLabel->setStyleSheet(QString("font-size: %1px;").arg(conf::dialogs::labelSize));
visibilityCombo_ = new QComboBox(this);
visibilityCombo_->addItem("Private"); visibilityCombo_->addItem("Private");
visibilityCombo_->addItem("Public"); visibilityCombo_->addItem("Public");
visibilityLayout->addWidget(visibilityLabel); visibilityLayout->addWidget(visibilityLabel);
visibilityLayout->addWidget(visibilityCombo_, 0, Qt::AlignBottom | Qt::AlignRight); visibilityLayout->addWidget(visibilityCombo_, 0, Qt::AlignBottom | Qt::AlignRight);
auto presetLabel = new QLabel(tr("Room preset"), this); auto presetLabel = new QLabel(tr("Room Preset"), this);
presetCombo_ = new QComboBox(this); presetLabel->setStyleSheet(QString("font-size: %1px;").arg(conf::dialogs::labelSize));
presetCombo_ = new QComboBox(this);
presetCombo_->addItem("Private Chat"); presetCombo_->addItem("Private Chat");
presetCombo_->addItem("Public Chat"); presetCombo_->addItem("Public Chat");
presetCombo_->addItem("Trusted Private Chat"); presetCombo_->addItem("Trusted Private Chat");
@ -72,11 +74,11 @@ CreateRoom::CreateRoom(QWidget *parent)
presetLayout->addWidget(presetCombo_, 0, Qt::AlignBottom | Qt::AlignRight); presetLayout->addWidget(presetCombo_, 0, Qt::AlignBottom | Qt::AlignRight);
auto directLabel_ = new QLabel(tr("Direct Chat"), this); 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_->setActiveColor(QColor("#38A3D8"));
directToggle_->setInactiveColor(QColor("gray")); directToggle_->setInactiveColor(QColor("gray"));
directToggle_->setState(true); directToggle_->setState(true);
directLabel_->setStyleSheet("font-size: 15px;");
auto directLayout = new QHBoxLayout; auto directLayout = new QHBoxLayout;
directLayout->setContentsMargins(0, 10, 0, 10); directLayout->setContentsMargins(0, 10, 0, 10);