From 730a56f58e3b6e556437ca462645504a860a1ed2 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Sat, 1 Jul 2017 12:46:58 +0300 Subject: [PATCH 1/5] Remove hardcoded font sizes, margins etc - Fixes small font issue on MacOs --- Makefile | 30 +++++++-- include/RoomInfoListItem.h | 6 ++ include/TimelineItem.h | 9 +-- src/RoomInfoListItem.cc | 30 ++++++--- src/TimelineItem.cc | 126 ++++++++++++++++++++++--------------- 5 files changed, 132 insertions(+), 69 deletions(-) diff --git a/Makefile b/Makefile index 5802f833..b4af63fb 100644 --- a/Makefile +++ b/Makefile @@ -1,23 +1,45 @@ SRC := $(shell find include src -type f -type f \( -iname "*.cc" -o -iname "*.h" \)) +# Linux specific helpers debug: @cmake -DBUILD_TESTS=OFF -H. -GNinja -Bbuild -DCMAKE_BUILD_TYPE=Debug @cmake --build build + release-debug: @cmake -DBUILD_TESTS=OFF -H. -GNinja -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo @cmake --build build +test: + @cmake -DBUILD_TESTS=ON -H. -GNinja -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo + @cmake --build build + @cd build && GTEST_COLOR=1 ctest --verbose + +# MacOS specific helpers +mdebug: + @cmake -DBUILD_TESTS=OFF \ + -H. \ + -GNinja \ + -Bbuild \ + -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 \ + -DCMAKE_BUILD_TYPE=Debug + @cmake --build build + +mrelease: + @cmake -DBUILD_TESTS=OFF \ + -H. \ + -GNinja \ + -Bbuild \ + -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo + @cmake --build build + run: @./build/nheko lint: @clang-format -i $(SRC) -test: - @cmake -DBUILD_TESTS=ON -H. -GNinja -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo - @cmake --build build - @cd build && GTEST_COLOR=1 ctest --verbose clean: rm -rf build diff --git a/include/RoomInfoListItem.h b/include/RoomInfoListItem.h index 12d5abb1..f725dc06 100644 --- a/include/RoomInfoListItem.h +++ b/include/RoomInfoListItem.h @@ -75,6 +75,12 @@ private: QPixmap roomAvatar_; + // Sizes are relative to the default font size of the Widget. + static const float UnreadCountFontRatio; + static const float RoomNameFontRatio; + static const float RoomDescriptionFontRatio; + static const float RoomAvatarLetterFontRatio; + Menu *menu_; QAction *toggleNotifications_; diff --git a/include/TimelineItem.h b/include/TimelineItem.h index c0cf1c7b..ccba27ad 100644 --- a/include/TimelineItem.h +++ b/include/TimelineItem.h @@ -69,13 +69,14 @@ private: QHBoxLayout *headerLayout_; // Username (&) Timestamp + int MessageMargin; + + const int AvatarSize = 36; + const float TimestampFontRatio = 0.8; + Avatar *userAvatar_; QLabel *timestamp_; QLabel *userName_; QLabel *body_; - - QFont bodyFont_; - QFont usernameFont_; - QFont timestampFont_; }; diff --git a/src/RoomInfoListItem.cc b/src/RoomInfoListItem.cc index be1b4133..eec53ce4 100644 --- a/src/RoomInfoListItem.cc +++ b/src/RoomInfoListItem.cc @@ -24,6 +24,11 @@ #include "RoomState.h" #include "Theme.h" +const float RoomInfoListItem::UnreadCountFontRatio = 0.8; +const float RoomInfoListItem::RoomNameFontRatio = 1.1; +const float RoomInfoListItem::RoomDescriptionFontRatio = 1.1; +const float RoomInfoListItem::RoomAvatarLetterFontRatio = 1.8; + RoomInfoListItem::RoomInfoListItem(QSharedPointer settings, RoomState state, QString room_id, @@ -84,10 +89,9 @@ void RoomInfoListItem::paintEvent(QPaintEvent *event) else p.fillRect(rect(), QColor("#F8FBFE")); - QFont font("Open Sans", 10); - + QFont font; QFontMetrics metrics(font); - p.setFont(font); + p.setPen(QColor("#333")); QRect avatarRegion(Padding, Padding, IconSize, IconSize); @@ -101,6 +105,9 @@ void RoomInfoListItem::paintEvent(QPaintEvent *event) p.setPen(pen); } + font.setPointSize(this->font().pointSize() * RoomNameFontRatio); + p.setFont(font); + auto name = metrics.elidedText(state_.getName(), Qt::ElideRight, (width() - IconSize - 2 * Padding) * 0.8); p.drawText(QPoint(2 * Padding + IconSize, Padding + metrics.height()), name); @@ -109,11 +116,14 @@ void RoomInfoListItem::paintEvent(QPaintEvent *event) p.setPen(pen); } - double descPercentage = 0.95; + double descPercentage = 0.90; if (unreadMsgCount_ > 0) descPercentage = 0.8; + font.setPointSize(this->font().pointSize() * RoomDescriptionFontRatio); + p.setFont(font); + auto description = metrics.elidedText(state_.getTopic(), Qt::ElideRight, width() * descPercentage - 2 * Padding - IconSize); p.drawText(QPoint(2 * Padding + IconSize, bottom_y), description); } @@ -131,7 +141,7 @@ void RoomInfoListItem::paintEvent(QPaintEvent *event) p.drawEllipse(avatarRegion.center(), IconSize / 2, IconSize / 2); - font.setPointSize(13); + font.setPointSize(this->font().pointSize() * RoomAvatarLetterFontRatio); p.setFont(font); p.setPen(QColor("#333")); p.setBrush(Qt::NoBrush); @@ -158,13 +168,13 @@ void RoomInfoListItem::paintEvent(QPaintEvent *event) if (isPressed_) brush.setColor(textColor); + QFont unreadCountFont; + unreadCountFont.setPointSize(this->font().pointSize() * UnreadCountFontRatio); + unreadCountFont.setBold(true); + p.setBrush(brush); p.setPen(Qt::NoPen); - - QFont msgFont("Open Sans", 8); - msgFont.setStyleName("Bold"); - - p.setFont(msgFont); + p.setFont(unreadCountFont); int diameter = 20; diff --git a/src/TimelineItem.cc b/src/TimelineItem.cc index cf8d5e85..12ebcfde 100644 --- a/src/TimelineItem.cc +++ b/src/TimelineItem.cc @@ -19,6 +19,7 @@ #include #include #include +#include #include "AvatarProvider.h" #include "ImageItem.h" @@ -38,24 +39,35 @@ void TimelineItem::init() userName_ = nullptr; body_ = nullptr; - QFontDatabase db; - - bodyFont_ = db.font("Open Sans", "Regular", 10); - usernameFont_ = db.font("Open Sans", "Bold", 10); - timestampFont_ = db.font("Open Sans", "Regular", 7); + // Initialize layout spacing variables based on the current font. + QFontMetrics fm(this->font()); + const int baseWidth = fm.width('A'); + MessageMargin = baseWidth * 1.5; topLayout_ = new QHBoxLayout(this); sideLayout_ = new QVBoxLayout(); mainLayout_ = new QVBoxLayout(); headerLayout_ = new QHBoxLayout(); - topLayout_->setContentsMargins(7, 0, 0, 0); - topLayout_->setSpacing(9); + topLayout_->setContentsMargins(MessageMargin, MessageMargin, 0, 0); + topLayout_->setSpacing(0); topLayout_->addLayout(sideLayout_); topLayout_->addLayout(mainLayout_, 1); + + sideLayout_->setMargin(0); + sideLayout_->setSpacing(0); + + mainLayout_->setContentsMargins(baseWidth * 2, 0, 0, 0); + mainLayout_->setSpacing(0); + + headerLayout_->setMargin(0); + headerLayout_->setSpacing(baseWidth / 2); } +/* + * For messages created locally. The avatar and the username are displayed. + */ TimelineItem::TimelineItem(const QString &userid, const QString &color, QString body, QWidget *parent) : QWidget(parent) { @@ -71,12 +83,13 @@ TimelineItem::TimelineItem(const QString &userid, const QString &color, QString mainLayout_->addLayout(headerLayout_); mainLayout_->addWidget(body_); - mainLayout_->setMargin(0); - mainLayout_->setSpacing(0); AvatarProvider::resolve(userid, this); } +/* + * For messages created locally. Only the text is displayed. + */ TimelineItem::TimelineItem(QString body, QWidget *parent) : QWidget(parent) { @@ -90,11 +103,15 @@ TimelineItem::TimelineItem(QString body, QWidget *parent) setupSimpleLayout(); mainLayout_->addWidget(body_); - mainLayout_->setMargin(0); - mainLayout_->setSpacing(2); } -TimelineItem::TimelineItem(ImageItem *image, const events::MessageEvent &event, const QString &color, QWidget *parent) +/* + * Used to display images. The avatar and the username are displayed. + */ +TimelineItem::TimelineItem(ImageItem *image, + const events::MessageEvent &event, + const QString &color, + QWidget *parent) : QWidget(parent) { init(); @@ -113,12 +130,13 @@ TimelineItem::TimelineItem(ImageItem *image, const events::MessageEventaddLayout(headerLayout_); mainLayout_->addLayout(imageLayout); - mainLayout_->setContentsMargins(0, 4, 0, 0); - mainLayout_->setSpacing(0); AvatarProvider::resolve(event.sender(), this); } +/* + * Used to display images. Only the image is displayed. + */ TimelineItem::TimelineItem(ImageItem *image, const events::MessageEvent &event, QWidget *parent) : QWidget(parent) { @@ -135,10 +153,11 @@ TimelineItem::TimelineItem(ImageItem *image, const events::MessageEventaddStretch(1); mainLayout_->addLayout(imageLayout); - mainLayout_->setContentsMargins(0, 4, 0, 0); - mainLayout_->setSpacing(2); } +/* + * Used to display remote notice messages. + */ TimelineItem::TimelineItem(const events::MessageEvent &event, bool with_sender, const QString &color, QWidget *parent) : QWidget(parent) { @@ -159,22 +178,19 @@ TimelineItem::TimelineItem(const events::MessageEvent &event, bool setupAvatarLayout(displayName); mainLayout_->addLayout(headerLayout_); - mainLayout_->addWidget(body_); - mainLayout_->setMargin(0); - mainLayout_->setSpacing(0); AvatarProvider::resolve(event.sender(), this); } else { generateBody(body); - setupSimpleLayout(); - - mainLayout_->addWidget(body_); - mainLayout_->setMargin(0); - mainLayout_->setSpacing(2); } + + mainLayout_->addWidget(body_); } +/* + * Used to display remote text messages. + */ TimelineItem::TimelineItem(const events::MessageEvent &event, bool with_sender, const QString &color, QWidget *parent) : QWidget(parent) { @@ -189,37 +205,30 @@ TimelineItem::TimelineItem(const events::MessageEvent &event, bool w if (with_sender) { auto displayName = TimelineViewManager::displayName(event.sender()); - generateBody(displayName, color, body); + generateBody(displayName, color, body); setupAvatarLayout(displayName); mainLayout_->addLayout(headerLayout_); - mainLayout_->addWidget(body_); - mainLayout_->setMargin(0); - mainLayout_->setSpacing(0); AvatarProvider::resolve(event.sender(), this); } else { generateBody(body); - setupSimpleLayout(); - - mainLayout_->addWidget(body_); - mainLayout_->setMargin(0); - mainLayout_->setSpacing(2); } + + mainLayout_->addWidget(body_); } // Only the body is displayed. void TimelineItem::generateBody(const QString &body) { - QString content("%1"); + QString content(" %1 "); body_ = new QLabel(this); body_->setWordWrap(true); - body_->setFont(bodyFont_); body_->setText(content.arg(replaceEmoji(body))); - body_->setAlignment(Qt::AlignTop); + body_->setMargin(0); body_->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextBrowserInteraction); body_->setOpenExternalLinks(true); @@ -237,32 +246,38 @@ void TimelineItem::generateBody(const QString &userid, const QString &color, con QString userContent(" %2 "); QString bodyContent(" %1 "); + QFont usernameFont; + usernameFont.setBold(true); + userName_ = new QLabel(this); - userName_->setFont(usernameFont_); + userName_->setFont(usernameFont); userName_->setText(userContent.arg(color).arg(sender)); - userName_->setAlignment(Qt::AlignTop); if (body.isEmpty()) return; body_ = new QLabel(this); - body_->setFont(bodyFont_); body_->setWordWrap(true); - body_->setAlignment(Qt::AlignTop); body_->setText(bodyContent.arg(replaceEmoji(body))); body_->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextBrowserInteraction); body_->setOpenExternalLinks(true); + body_->setMargin(0); } void TimelineItem::generateTimestamp(const QDateTime &time) { QString msg(" %1 "); + QFont timestampFont; + timestampFont.setPointSize(this->font().pointSize() * TimestampFontRatio); + + QFontMetrics fm(timestampFont); + int topMargin = QFontMetrics(this->font()).height() - fm.height(); + timestamp_ = new QLabel(this); - timestamp_->setFont(timestampFont_); + timestamp_->setFont(timestampFont); timestamp_->setText(msg.arg(time.toString("HH:mm"))); - timestamp_->setAlignment(Qt::AlignTop); - timestamp_->setStyleSheet("margin-top: 2px;"); + timestamp_->setContentsMargins(0, topMargin, 0, 0); } QString TimelineItem::replaceEmoji(const QString &body) @@ -274,7 +289,7 @@ QString TimelineItem::replaceEmoji(const QString &body) // TODO: Be more precise here. if (code > 9000) - fmtBody += "" + QString(c) + ""; + fmtBody += "" + QString(c) + ""; else fmtBody += c; } @@ -284,13 +299,13 @@ QString TimelineItem::replaceEmoji(const QString &body) void TimelineItem::setupAvatarLayout(const QString &userName) { - topLayout_->setContentsMargins(7, 6, 0, 0); + topLayout_->setContentsMargins(MessageMargin, MessageMargin, 0, 0); userAvatar_ = new Avatar(this); userAvatar_->setLetter(QChar(userName[0]).toUpper()); userAvatar_->setBackgroundColor(QColor("#eee")); userAvatar_->setTextColor(QColor("black")); - userAvatar_->setSize(32); + userAvatar_->setSize(AvatarSize); // TODO: The provided user name should be a UserId class if (userName[0] == '@' && userName.size() > 1) @@ -298,20 +313,29 @@ void TimelineItem::setupAvatarLayout(const QString &userName) sideLayout_->addWidget(userAvatar_); sideLayout_->addStretch(1); - sideLayout_->setMargin(0); - sideLayout_->setSpacing(0); headerLayout_->addWidget(userName_); headerLayout_->addWidget(timestamp_, 1); - headerLayout_->setMargin(0); } void TimelineItem::setupSimpleLayout() { sideLayout_->addWidget(timestamp_); - sideLayout_->addStretch(1); - topLayout_->setContentsMargins(9, 0, 0, 0); + // Keep only the time in plain text. + QTextEdit htmlText(timestamp_->text()); + QString plainText = htmlText.toPlainText(); + + // Align the end of the avatar bubble with the end of the timestamp for + // messages with and without avatar. Otherwise their bodies would not be aligned. + int timestampWidth = timestamp_->fontMetrics().boundingRect(plainText).width(); + int offset = std::max(0, AvatarSize - timestampWidth) / 2; + + int defaultFontHeight = QFontMetrics(this->font()).height(); + + timestamp_->setAlignment(Qt::AlignTop); + timestamp_->setContentsMargins(offset, defaultFontHeight - timestamp_->fontMetrics().height(), offset, 0); + topLayout_->setContentsMargins(MessageMargin, MessageMargin / 3, 0, 0); } void TimelineItem::setUserAvatar(const QImage &avatar) From 0ed23506646ff2b8cbd5b99ebce22745740a80da Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Sat, 1 Jul 2017 14:03:00 +0300 Subject: [PATCH 2/5] Set emoji size relative to the default font --- include/TimelineItem.h | 3 +++ src/TimelineItem.cc | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/TimelineItem.h b/include/TimelineItem.h index ccba27ad..6fd26f52 100644 --- a/include/TimelineItem.h +++ b/include/TimelineItem.h @@ -73,6 +73,9 @@ private: const int AvatarSize = 36; const float TimestampFontRatio = 0.8; + const float EmojiFontRatio = 1.4; + + float EmojiSize = 13; Avatar *userAvatar_; diff --git a/src/TimelineItem.cc b/src/TimelineItem.cc index 12ebcfde..66c55f0c 100644 --- a/src/TimelineItem.cc +++ b/src/TimelineItem.cc @@ -44,6 +44,8 @@ void TimelineItem::init() const int baseWidth = fm.width('A'); MessageMargin = baseWidth * 1.5; + EmojiSize = this->font().pointSize() * EmojiFontRatio; + topLayout_ = new QHBoxLayout(this); sideLayout_ = new QVBoxLayout(); mainLayout_ = new QVBoxLayout(); @@ -289,7 +291,9 @@ QString TimelineItem::replaceEmoji(const QString &body) // TODO: Be more precise here. if (code > 9000) - fmtBody += "" + QString(c) + ""; + fmtBody += QString("").arg(EmojiSize) + + QString(c) + + ""; else fmtBody += c; } From 22d0f50e366848879cb3010a61e05f95cedd5f3f Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Sat, 1 Jul 2017 15:21:07 +0300 Subject: [PATCH 3/5] Add option for the default font size --- README.md | 2 +- src/main.cc | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 591190d5..c6104cf1 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ encouraged to open feature request issues. Here is a screen shot to get a feel for the UI, but things will probably change. -![nheko](https://dl.dropboxusercontent.com/s/cs2891enrf2lqo9/nheko.jpg) +![nheko](https://dl.dropboxusercontent.com/s/5iydk5r3b9zyycd/nheko-ui.png) ### Third party diff --git a/src/main.cc b/src/main.cc index bf165cab..28523858 100644 --- a/src/main.cc +++ b/src/main.cc @@ -41,7 +41,13 @@ int main(int argc, char *argv[]) app.setWindowIcon(QIcon(":/logos/nheko.png")); - QFont font("Open Sans"); + QSettings settings; + + // Set the default if a value has not been set. + if (settings.value("font/size").toInt() == 0) + settings.setValue("font/size", 12); + + QFont font("Open Sans", settings.value("font/size").toInt()); app.setFont(font); QString lang = QLocale::system().name(); From 97ca8d0ed109dc2be80e459e4b2a4dbafa1aced8 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Sat, 1 Jul 2017 15:52:46 +0300 Subject: [PATCH 4/5] Remove hardcoded font sizes on the top bars and text input --- include/TextInputWidget.h | 3 +++ include/TopRoomBar.h | 11 +++++++++-- include/UserInfoWidget.h | 3 +++ src/TextInputWidget.cc | 10 +++++++--- src/TopRoomBar.cc | 11 +++++++++-- src/UserInfoWidget.cc | 21 +++++++++++---------- 6 files changed, 42 insertions(+), 17 deletions(-) diff --git a/include/TextInputWidget.h b/include/TextInputWidget.h index 225750f2..e176d48c 100644 --- a/include/TextInputWidget.h +++ b/include/TextInputWidget.h @@ -63,4 +63,7 @@ private: FlatButton *send_file_button_; FlatButton *send_message_button_; EmojiPickButton *emoji_button_; + + const float TextFontRatio = 1.1; + const float EmojiFontRatio = 1.3; }; diff --git a/include/TopRoomBar.h b/include/TopRoomBar.h index 6e4bfe7a..ad246090 100644 --- a/include/TopRoomBar.h +++ b/include/TopRoomBar.h @@ -68,6 +68,9 @@ private: Avatar *avatar_; int buttonSize_; + + const float RoomNameFontRatio = 1.2; + const float RoomDescriptionFontRatio = 1; }; inline void TopRoomBar::updateRoomAvatar(const QImage &avatar_image) @@ -82,10 +85,14 @@ inline void TopRoomBar::updateRoomAvatar(const QIcon &icon) inline void TopRoomBar::updateRoomName(const QString &name) { - name_label_->setText(name); + QString elidedText = QFontMetrics(name_label_->font()) + .elidedText(name, Qt::ElideRight, width() * 0.8); + name_label_->setText(elidedText); } inline void TopRoomBar::updateRoomTopic(const QString &topic) { - topic_label_->setText(topic); + QString elidedText = QFontMetrics(topic_label_->font()) + .elidedText(topic, Qt::ElideRight, width() * 0.8); + topic_label_->setText(elidedText); } diff --git a/include/UserInfoWidget.h b/include/UserInfoWidget.h index 10c770d8..35f7a6f5 100644 --- a/include/UserInfoWidget.h +++ b/include/UserInfoWidget.h @@ -72,4 +72,7 @@ private: LogoutDialog *logoutDialog_; int logoutButtonSize_; + + const float DisplayNameFontRatio = 1.3; + const float UserIdFontRatio = 1.1; }; diff --git a/src/TextInputWidget.cc b/src/TextInputWidget.cc index 82cc8b4e..f09608a0 100644 --- a/src/TextInputWidget.cc +++ b/src/TextInputWidget.cc @@ -57,10 +57,14 @@ TextInputWidget::TextInputWidget(QWidget *parent) send_file_button_->setIcon(send_file_icon); send_file_button_->setIconSize(QSize(24, 24)); + QFont font; + font.setPointSize(this->font().pointSize() * TextFontRatio); + input_ = new FilteredTextEdit(this); input_->setFixedHeight(45); + input_->setFont(font); input_->setPlaceholderText(tr("Write a message...")); - input_->setStyleSheet("color: #333333; font-size: 13px; border-radius: 0; padding-top: 10px;"); + input_->setStyleSheet("color: #333333; border-radius: 0; padding-top: 10px;"); send_message_button_ = new FlatButton(this); send_message_button_->setForegroundColor(QColor("#acc7dc")); @@ -95,10 +99,10 @@ void TextInputWidget::addSelectedEmoji(const QString &emoji) QTextCursor cursor = input_->textCursor(); QFont emoji_font("Emoji One"); - emoji_font.setPixelSize(18); + emoji_font.setPointSize(this->font().pointSize() * EmojiFontRatio); QFont text_font("Open Sans"); - text_font.setPixelSize(13); + text_font.setPixelSize(this->font().pointSize() * TextFontRatio); QTextCharFormat charfmt; charfmt.setFont(emoji_font); diff --git a/src/TopRoomBar.cc b/src/TopRoomBar.cc index 4b4c8aa5..74e255a0 100644 --- a/src/TopRoomBar.cc +++ b/src/TopRoomBar.cc @@ -41,11 +41,18 @@ TopRoomBar::TopRoomBar(QWidget *parent) text_layout_->setSpacing(0); text_layout_->setContentsMargins(0, 0, 0, 0); + QFont font; + font.setPointSize(this->font().pointSize() * RoomNameFontRatio); + font.setBold(true); + name_label_ = new QLabel(this); - name_label_->setStyleSheet("font-size: 14px; font-weight: 600;"); + name_label_->setFont(font); + + font.setBold(false); + font.setPointSize(this->font().pointSize() * RoomDescriptionFontRatio); topic_label_ = new QLabel(this); - topic_label_->setStyleSheet("font-size: 12px;"); + topic_label_->setFont(font); text_layout_->addWidget(name_label_); text_layout_->addWidget(topic_label_); diff --git a/src/UserInfoWidget.cc b/src/UserInfoWidget.cc index 361689ef..a8fddcd0 100644 --- a/src/UserInfoWidget.cc +++ b/src/UserInfoWidget.cc @@ -47,20 +47,21 @@ UserInfoWidget::UserInfoWidget(QWidget *parent) userAvatar_->setBackgroundColor("#f9f9f9"); userAvatar_->setTextColor("#333333"); + QFont font; + font.setBold(true); + font.setPointSize(this->font().pointSize() * DisplayNameFontRatio); + displayNameLabel_ = new QLabel(this); - displayNameLabel_->setStyleSheet( - "padding: 0 9px;" - "color: #171919;" - "font-size: 14px;" - "font-weight: 500;" - "margin-bottom: -10px;"); + displayNameLabel_->setFont(font); + displayNameLabel_->setStyleSheet("padding: 0 9px; color: #171919; margin-bottom: -10px;"); displayNameLabel_->setAlignment(Qt::AlignLeading | Qt::AlignLeft | Qt::AlignTop); + font.setBold(false); + font.setPointSize(this->font().pointSize() * UserIdFontRatio); + userIdLabel_ = new QLabel(this); - userIdLabel_->setStyleSheet( - "padding: 0 8px 8px 8px;" - "color: #555459;" - "font-size: 13px"); + userIdLabel_->setFont(font); + userIdLabel_->setStyleSheet("padding: 0 8px 8px 8px; color: #555459;"); userIdLabel_->setAlignment(Qt::AlignLeading | Qt::AlignLeft | Qt::AlignVCenter); avatarLayout_->addWidget(userAvatar_); From 06cacc13d1ddcc4fb7f9dcd21debe826107fac5a Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Sat, 1 Jul 2017 16:34:36 +0300 Subject: [PATCH 5/5] Show unread count on MacOs toolbar --- CMakeLists.txt | 8 ++++++++ src/TrayIcon.cc | 11 +++++++++++ 2 files changed, 19 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 51e1993b..26aaf1ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,10 @@ find_package(Qt5Widgets REQUIRED) find_package(Qt5Network REQUIRED) find_package(Qt5LinguistTools REQUIRED) +if (APPLE) + find_package(Qt5MacExtras REQUIRED) +endif(APPLE) + if (Qt5Widgets_FOUND) if (Qt5Widgets_VERSION VERSION_LESS 5.7.0) message(STATUS "Qt version ${Qt5Widgets_VERSION}") @@ -244,6 +248,10 @@ else() add_executable (nheko ${OS_BUNDLE} ${SRC_FILES} ${UI_HEADERS} ${MOC_HEADERS} ${QRC} ${LANG_QRC} ${QM_SRC}) target_link_libraries (nheko matrix_events Qt5::Widgets Qt5::Network) + if (APPLE) + target_link_libraries(nheko Qt5::MacExtras) + endif(APPLE) + if(WIN32) target_link_libraries(nheko Qt5::WinMain) endif(WIN32) diff --git a/src/TrayIcon.cc b/src/TrayIcon.cc index beaf00df..7e649077 100644 --- a/src/TrayIcon.cc +++ b/src/TrayIcon.cc @@ -20,6 +20,10 @@ #include "TrayIcon.h" +#if defined(Q_OS_MAC) +#include +#endif + MsgCountComposedIcon::MsgCountComposedIcon(const QString &filename) : QIconEngine() { @@ -91,10 +95,17 @@ TrayIcon::TrayIcon(const QString &filename, QWidget *parent) void TrayIcon::setUnreadCount(int count) { +#if defined(Q_OS_MAC) + if (count == 0) + QtMac::setBadgeLabelText(""); + else + QtMac::setBadgeLabelText(QString::number(count)); +#else MsgCountComposedIcon *tmp = static_cast(icon_->clone()); tmp->msgCount = count; setIcon(QIcon(tmp)); icon_ = tmp; +#endif }