summary refs log tree commit diff
path: root/src/dialogs
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2018-09-30 13:24:36 +0300
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2018-09-30 13:24:36 +0300
commit9038c950aef4a59cc9f928541cb20b010be9a8df (patch)
tree504b717640347d041253a3067248e5311da96da6 /src/dialogs
parentRemove obsolete font/size setting (diff)
downloadnheko-9038c950aef4a59cc9f928541cb20b010be9a8df.tar.xz
Remove pixel value from fonts
Diffstat (limited to 'src/dialogs')
-rw-r--r--src/dialogs/CreateRoom.cpp8
-rw-r--r--src/dialogs/MemberList.cpp6
-rw-r--r--src/dialogs/ReadReceipts.cpp6
-rw-r--r--src/dialogs/RoomSettings.cpp16
-rw-r--r--src/dialogs/UserProfile.cpp6
5 files changed, 21 insertions, 21 deletions
diff --git a/src/dialogs/CreateRoom.cpp b/src/dialogs/CreateRoom.cpp

index 46ba5a35..078a3038 100644 --- a/src/dialogs/CreateRoom.cpp +++ b/src/dialogs/CreateRoom.cpp
@@ -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")); diff --git a/src/dialogs/MemberList.cpp b/src/dialogs/MemberList.cpp
index dae4fc86..f4167143 100644 --- a/src/dialogs/MemberList.cpp +++ b/src/dialogs/MemberList.cpp
@@ -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; diff --git a/src/dialogs/ReadReceipts.cpp b/src/dialogs/ReadReceipts.cpp
index d0bfd36c..dc4145db 100644 --- a/src/dialogs/ReadReceipts.cpp +++ b/src/dialogs/ReadReceipts.cpp
@@ -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; diff --git a/src/dialogs/RoomSettings.cpp b/src/dialogs/RoomSettings.cpp
index c4bb7af5..c192bd3d 100644 --- a/src/dialogs/RoomSettings.cpp +++ b/src/dialogs/RoomSettings.cpp
@@ -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); diff --git a/src/dialogs/UserProfile.cpp b/src/dialogs/UserProfile.cpp
index 14aa6819..27182711 100644 --- a/src/dialogs/UserProfile.cpp +++ b/src/dialogs/UserProfile.cpp
@@ -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);