mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-09 10:55:19 +00:00
Code Issues Releases Wiki Activity

Improve collapsed rows in small chats list.

Browse Source
This commit is contained in:
John Preston
2019-05-03 17:02:00 +04:00
parent 2d4a743231
commit 8bfef7d873
3 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Telegram/SourceFiles/dialogs/dialogs_layout.cpp
View File

@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/history.h"
#include "data/data_channel.h"
#include "data/data_user.h"
#include "data/data_folder.h"
namespace Dialogs {
namespace Layout {
@@ -849,21 +850,44 @@ QRect RowPainter::sendActionAnimationRect(int animationWidth, int animationHeigh
return QRect(nameleft, texttop, textUpdated ? namewidth : animationWidth, animationHeight);
}
void PaintCollapsedRow(Painter &p, const RippleRow &row, const QString &text, int unread, int fullWidth, bool selected) {
void PaintCollapsedRow(
Painter &p,
const RippleRow &row,
Data::Folder *folder,
const QString &text,
int unread,
int fullWidth,
bool selected) {
p.fillRect(0, 0, fullWidth, st::dialogsImportantBarHeight, selected ? st::dialogsBgOver : st::dialogsBg);
row.paintRipple(p, 0, 0, fullWidth);
p.setFont(st::semiboldFont);
p.setPen(st::dialogsNameFg);
const auto smallWidth = st::dialogsPadding.x()
+ st::dialogsPhotoSize
+ st::dialogsPhotoPadding;
const auto narrow = (fullWidth <= smallWidth);
const auto unreadTop = (st::dialogsImportantBarHeight - st::dialogsUnreadHeight) / 2;
const auto textBaseline = unreadTop
+ (st::dialogsUnreadHeight - st::dialogsUnreadFont->height) / 2
+ st::dialogsUnreadFont->ascent;
p.drawText(st::dialogsPadding.x(), textBaseline, text);
if (!narrow || !folder) {
p.setFont(st::semiboldFont);
p.setPen(st::dialogsNameFg);
if (unread) {
const auto textBaseline = unreadTop
+ (st::dialogsUnreadHeight - st::dialogsUnreadFont->height) / 2
+ st::dialogsUnreadFont->ascent;
const auto left = narrow
? ((fullWidth - st::semiboldFont->width(text)) / 2)
: st::dialogsPadding.x();
p.drawText(left, textBaseline, text);
} else {
folder->paintUserpicLeft(
p,
(fullWidth - st::dialogsUnreadHeight) / 2,
unreadTop,
fullWidth,
st::dialogsUnreadHeight);
}
if (!narrow && unread) {
const auto unreadRight = fullWidth - st::dialogsPadding.x();
UnreadBadgeStyle st;
st.muted = true;