From 3d2e29bfa0ec0ad387064e31e8fcd69097b9a560 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Sun, 22 Jul 2018 18:03:12 +0300 Subject: Remove pixel values from modals, use pointSize instead --- src/dialogs/MemberList.cpp | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'src/dialogs/MemberList.cpp') diff --git a/src/dialogs/MemberList.cpp b/src/dialogs/MemberList.cpp index 60c2eb0a..9757b8af 100644 --- a/src/dialogs/MemberList.cpp +++ b/src/dialogs/MemberList.cpp @@ -26,7 +26,7 @@ MemberItem::MemberItem(const RoomMember &member, QWidget *parent) textLayout_->setSpacing(0); avatar_ = new Avatar(this); - avatar_->setSize(44); + avatar_->setSize(46); avatar_->setLetter(utils::firstChar(member.display_name)); if (!member.avatar.isNull()) @@ -37,18 +37,14 @@ MemberItem::MemberItem(const RoomMember &member, QWidget *parent) this, [this](const QImage &img) { avatar_->setImage(img); }); - QFont nameFont, idFont; + QFont nameFont; nameFont.setWeight(65); - nameFont.setPixelSize(conf::receipts::font + 1); - idFont.setWeight(50); - idFont.setPixelSize(conf::receipts::font); + nameFont.setPointSizeF(nameFont.pointSizeF() * 1.1); + userId_ = new QLabel(member.user_id, this); userName_ = new QLabel(member.display_name, this); userName_->setFont(nameFont); - userId_ = new QLabel(member.user_id, this); - userId_->setFont(idFont); - textLayout_->addWidget(userName_); textLayout_->addWidget(userId_); @@ -60,12 +56,17 @@ MemberList::MemberList(const QString &room_id, QWidget *parent) : QFrame(parent) , room_id_{room_id} { - setMaximumSize(420, 380); + QFont doubleFont; + doubleFont.setPointSizeF(doubleFont.pointSizeF() * 2); + setMinimumWidth(QFontMetrics(doubleFont).averageCharWidth() * 30); + setMinimumHeight(conf::modals::MIN_WIDGET_HEIGHT); + + setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); setAttribute(Qt::WA_DeleteOnClose, true); auto layout = new QVBoxLayout(this); - layout->setSpacing(30); - layout->setMargin(20); + layout->setSpacing(conf::modals::WIDGET_SPACING); + layout->setMargin(conf::modals::WIDGET_MARGIN); list_ = new QListWidget; list_->setFrameStyle(QFrame::NoFrame); @@ -74,7 +75,7 @@ MemberList::MemberList(const QString &room_id, QWidget *parent) list_->setSpacing(5); QFont font; - font.setPixelSize(conf::headerFontSize); + font.setPointSizeF(font.pointSizeF() * conf::modals::LABEL_BIG_SIZE_RATIO); topLabel_ = new QLabel(tr("Room members"), this); topLabel_->setAlignment(Qt::AlignCenter); -- cgit 1.5.1