thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove pixel value from fonts

Browse source
This commit is contained in:
Konstantinos Sideris 2018-09-30 13:24:36 +03:00
parent d1e08e0008
commit 9038c950ae
29 changed files with 77 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/dialogs/CreateRoom.cpp
View file

@ -19,12 +19,12 @@ CreateRoom::CreateRoom(QWidget *parent)
setWindowModality(Qt::WindowModal);
setAttribute(Qt::WA_DeleteOnClose, true);
QFont doubleFont;
doubleFont.setPointSizeF(doubleFont.pointSizeF() * 2);
QFont largeFont;
largeFont.setPointSizeF(largeFont.pointSizeF() * 1.5);
setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
setMinimumHeight(conf::modals::MIN_WIDGET_HEIGHT);
setMinimumWidth(QFontMetrics(doubleFont).averageCharWidth() * 30 -
setMinimumWidth(QFontMetrics(largeFont).averageCharWidth() * 30 -
2 * conf::modals::WIDGET_MARGIN);
auto layout = new QVBoxLayout(this);
@ -43,7 +43,7 @@ CreateRoom::CreateRoom(QWidget *parent)
buttonLayout->addWidget(confirmBtn_);
QFont font;
font.setPixelSize(conf::headerFontSize);
font.setPointSizeF(font.pointSizeF() * 1.3);
nameInput_ = new TextField(this);
nameInput_->setLabel(tr("Name"));

6
src/dialogs/MemberList.cpp
View file

@ -81,13 +81,13 @@ MemberList::MemberList(const QString &room_id, QWidget *parent)
list_->setSelectionMode(QAbstractItemView::NoSelection);
list_->setSpacing(5);
QFont doubleFont;
doubleFont.setPointSizeF(doubleFont.pointSizeF() * 2);
QFont largeFont;
largeFont.setPointSizeF(largeFont.pointSizeF() * 1.5);
setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
setMinimumHeight(list_->sizeHint().height() * 2);
setMinimumWidth(std::max(list_->sizeHint().width() + 4 * conf::modals::WIDGET_MARGIN,
QFontMetrics(doubleFont).averageCharWidth() * 30 -
QFontMetrics(largeFont).averageCharWidth() * 30 -
2 * conf::modals::WIDGET_MARGIN));
QFont font;

6
src/dialogs/ReadReceipts.cpp
View file

@ -104,13 +104,13 @@ ReadReceipts::ReadReceipts(QWidget *parent)
userList_->setSelectionMode(QAbstractItemView::NoSelection);
userList_->setSpacing(conf::modals::TEXT_SPACING);
QFont doubleFont;
doubleFont.setPointSizeF(doubleFont.pointSizeF() * 2);
QFont largeFont;
largeFont.setPointSizeF(largeFont.pointSizeF() * 1.5);
setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
setMinimumHeight(userList_->sizeHint().height() * 2);
setMinimumWidth(std::max(userList_->sizeHint().width() + 4 * conf::modals::WIDGET_MARGIN,
QFontMetrics(doubleFont).averageCharWidth() * 30 -
QFontMetrics(largeFont).averageCharWidth() * 30 -
2 * conf::modals::WIDGET_MARGIN));
QFont font;

16
src/dialogs/RoomSettings.cpp
View file

@ -48,9 +48,9 @@ EditModal::EditModal(const QString &roomId, QWidget *parent)
setWindowFlags(Qt::Tool | Qt::WindowStaysOnTopHint);
setWindowModality(Qt::WindowModal);
QFont doubleFont;
doubleFont.setPointSizeF(doubleFont.pointSizeF() * 2);
setMinimumWidth(QFontMetrics(doubleFont).averageCharWidth() * 30 - 2 * WIDGET_MARGIN);
QFont largeFont;
largeFont.setPointSizeF(largeFont.pointSizeF() * 1.4);
setMinimumWidth(QFontMetrics(largeFont).averageCharWidth() * 30 - 2 * WIDGET_MARGIN);
setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
auto layout = new QVBoxLayout(this);
@ -169,10 +169,10 @@ RoomSettings::RoomSettings(const QString &room_id, QWidget *parent)
setWindowModality(Qt::WindowModal);
setAttribute(Qt::WA_DeleteOnClose, true);
QFont doubleFont;
doubleFont.setPointSizeF(doubleFont.pointSizeF() * 2);
QFont largeFont;
largeFont.setPointSizeF(largeFont.pointSizeF() * 1.5);
setMinimumWidth(QFontMetrics(doubleFont).averageCharWidth() * 30 - 2 * WIDGET_MARGIN);
setMinimumWidth(QFontMetrics(largeFont).averageCharWidth() * 30 - 2 * WIDGET_MARGIN);
setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
auto layout = new QVBoxLayout(this);
@ -180,7 +180,7 @@ RoomSettings::RoomSettings(const QString &room_id, QWidget *parent)
layout->setContentsMargins(WIDGET_MARGIN, TOP_WIDGET_MARGIN, WIDGET_MARGIN, WIDGET_MARGIN);
QFont font;
font.setWeight(65);
font.setWeight(QFont::Medium);
font.setPointSizeF(font.pointSizeF() * 1.2);
auto settingsLabel = new QLabel(tr("Settings").toUpper(), this);
settingsLabel->setFont(font);
@ -356,7 +356,7 @@ RoomSettings::RoomSettings(const QString &room_id, QWidget *parent)
}
roomNameLabel_ = new QLabel(QString::fromStdString(info_.name), this);
roomNameLabel_->setFont(doubleFont);
roomNameLabel_->setFont(largeFont);
auto membersLabel = new QLabel(tr("%n member(s)", "", info_.member_count), this);

6
src/dialogs/UserProfile.cpp
View file

@ -171,12 +171,12 @@ UserProfile::UserProfile(QWidget *parent)
setWindowFlags(Qt::Tool | Qt::WindowStaysOnTopHint);
setWindowModality(Qt::WindowModal);
QFont doubleFont;
doubleFont.setPointSizeF(doubleFont.pointSizeF() * 2);
QFont largeFont;
largeFont.setPointSizeF(largeFont.pointSizeF() * 1.5);
setMinimumWidth(
std::max(devices_->sizeHint().width() + 4 * WIDGET_MARGIN,
QFontMetrics(doubleFont).averageCharWidth() * 30 - 2 * WIDGET_MARGIN));
QFontMetrics(largeFont).averageCharWidth() * 30 - 2 * WIDGET_MARGIN));
setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
vlayout->setSpacing(WIDGET_SPACING);