rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make the number of unread messages fit in the bubble

Browse Source 
fixes #330
This commit is contained in:
Konstantinos Sideris 2018-05-25 10:01:53 +03:00
parent 5e9d8373e4
commit 5538a04690
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/RoomInfoListItem.h
View File

@ -200,6 +200,7 @@ private:
QFont timestampFont_; QFont timestampFont_;
QFont usernameFont_; QFont usernameFont_;
QFont unreadCountFont_; QFont unreadCountFont_;
int bubbleDiameter_;
QColor timestampColor_; QColor timestampColor_;
QColor highlightedTimestampColor_; QColor highlightedTimestampColor_;

32
src/RoomInfoListItem.cc
View File

@ -31,7 +31,7 @@
#include "Theme.h" #include "Theme.h"
#include "Utils.h" #include "Utils.h"
constexpr int BubbleDiameter = 18; constexpr int MaxUnreadCountDisplayed = 99;
constexpr int Padding = 9; constexpr int Padding = 9;
constexpr int IconSize = 44; constexpr int IconSize = 44;
@ -65,6 +65,7 @@ RoomInfoListItem::init(QWidget *parent)
unreadCountFont_.setPixelSize(conf::roomlist::fonts::badge); unreadCountFont_.setPixelSize(conf::roomlist::fonts::badge);
unreadCountFont_.setBold(true); unreadCountFont_.setBold(true);
bubbleDiameter_ = QFontMetrics(unreadCountFont_).averageCharWidth() * 3;
timestampFont_ = font_; timestampFont_ = font_;
timestampFont_.setPixelSize(conf::roomlist::fonts::timestamp); timestampFont_.setPixelSize(conf::roomlist::fonts::timestamp);
@ -274,16 +275,22 @@ RoomInfoListItem::paintEvent(QPaintEvent *event)
p.setPen(Qt::NoPen); p.setPen(Qt::NoPen);
p.setFont(unreadCountFont_); p.setFont(unreadCountFont_);
QRectF r(width() - BubbleDiameter - Padding, // Extra space on the x-axis to accomodate the extra character space
bottom_y - BubbleDiameter / 2 - 5, // inside the bubble.
BubbleDiameter, const int x_width = unreadMsgCount_ > MaxUnreadCountDisplayed
BubbleDiameter); ? QFontMetrics(p.font()).averageCharWidth()
: 0;
QRectF r(width() - bubbleDiameter_ - Padding - x_width,
bottom_y - bubbleDiameter_ / 2 - 5,
bubbleDiameter_ + x_width,
bubbleDiameter_);
if (width() == ui::sidebar::SmallSize) if (width() == ui::sidebar::SmallSize)
r = QRectF(width() - BubbleDiameter - 5, r = QRectF(width() - bubbleDiameter_ - 5,
height() - BubbleDiameter - 5, height() - bubbleDiameter_ - 5,
BubbleDiameter, bubbleDiameter_ + x_width,
BubbleDiameter); bubbleDiameter_);
p.setPen(Qt::NoPen); p.setPen(Qt::NoPen);
p.drawEllipse(r); p.drawEllipse(r);
@ -293,9 +300,12 @@ RoomInfoListItem::paintEvent(QPaintEvent *event)
if (isPressed_) if (isPressed_)
p.setPen(QPen(bubbleBgColor())); p.setPen(QPen(bubbleBgColor()));
auto countTxt = unreadMsgCount_ > MaxUnreadCountDisplayed
? QString("99+")
: QString::number(unreadMsgCount_);
p.setBrush(Qt::NoBrush); p.setBrush(Qt::NoBrush);
p.drawText( p.drawText(r.translated(0, -0.5), Qt::AlignCenter, countTxt);
r.translated(0, -0.5), Qt::AlignCenter, QString::number(unreadMsgCount_));
} }
} }