MrBesen/tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Show segments around chats list userpics.

Browse Source
This commit is contained in:
John Preston 2023-07-17 21:07:36 +04:00
parent 734c5c6740
commit 8818012182
2 changed files with 56 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
Telegram/SourceFiles/dialogs/dialogs_row.cpp
View File

@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_folder.h" #include "data/data_folder.h"
#include "data/data_forum.h" #include "data/data_forum.h"
#include "data/data_session.h" #include "data/data_session.h"
#include "data/data_stories.h"
#include "data/data_peer_values.h" #include "data/data_peer_values.h"
#include "data/data_user.h" #include "data/data_user.h"
#include "history/history.h" #include "history/history.h"
@ -342,12 +343,14 @@ void Row::PaintCornerBadgeFrame(
Painter q(&data->frame); Painter q(&data->frame);
q.translate(framePadding, framePadding); q.translate(framePadding, framePadding);
auto hq = std::optional<PainterHighQualityEnabler>(); auto hq = std::optional<PainterHighQualityEnabler>();
if (data->storiesShown) { const auto photoSize = context.st->photoSize;
const auto storiesCount = data->storiesCount;
if (storiesCount) {
hq.emplace(q); hq.emplace(q);
const auto line = st::dialogsStoriesFull.lineTwice / 2.; const auto line = st::dialogsStoriesFull.lineTwice / 2.;
const auto skip = line * 3 / 2.; const auto skip = line * 3 / 2.;
const auto scale = 1. - (2 * skip / context.st->photoSize); const auto scale = 1. - (2 * skip / photoSize);
const auto center = context.st->photoSize / 2.; const auto center = photoSize / 2.;
q.save(); q.save();
q.translate(center, center); q.translate(center, center);
q.scale(scale, scale); q.scale(scale, scale);
@ -361,41 +364,43 @@ void Row::PaintCornerBadgeFrame(
0, 0,
0, 0,
data->frame.width() / data->frame.devicePixelRatio(), data->frame.width() / data->frame.devicePixelRatio(),
context.st->photoSize, photoSize,
context.paused); context.paused);
if (data->storiesShown) { if (storiesCount) {
q.restore(); q.restore();
const auto st = context.st; const auto st = context.st;
const auto outline = QRectF(0, 0, photoSize, photoSize);
const auto storiesUnreadCount = data->storiesUnreadCount;
const auto storiesUnreadBrush = [&] { const auto storiesUnreadBrush = [&] {
if (context.active) { if (context.active || !storiesUnreadCount) {
return st::dialogsUnreadBgMutedActive->b; return st::dialogsUnreadBgMutedActive->b;
} }
const auto left = st->padding.left(); const auto left = st->padding.left();
const auto top = st->padding.top(); const auto top = st->padding.top();
auto gradient = Ui::UnreadStoryOutlineGradient(QRectF( auto gradient = Ui::UnreadStoryOutlineGradient(outline);
st->padding.left(),
st->padding.top(),
st->photoSize,
st->photoSize));
return QBrush(gradient); return QBrush(gradient);
}; }();
const auto storiesBrush = data->storiesUnread const auto storiesBrush = context.active
? storiesUnreadBrush()
: context.active
? st::dialogsUnreadBgMutedActive->b ? st::dialogsUnreadBgMutedActive->b
: st::dialogsUnreadBgMuted->b; : st::dialogsUnreadBgMuted->b;
const auto storiesLine = data->storiesUnread const auto storiesUnread = st::dialogsStoriesFull.lineTwice / 2.;
? (st::dialogsStoriesFull.lineTwice / 2.) const auto storiesLine = st::dialogsStoriesFull.lineReadTwice / 2.;
: (st::dialogsStoriesFull.lineReadTwice / 2.); auto segments = std::vector<Ui::OutlineSegment>();
const auto pen = QPen(storiesBrush, storiesLine); segments.reserve(storiesCount);
q.setPen(pen); const auto storiesReadCount = storiesCount - storiesUnreadCount;
q.drawEllipse(0, 0, st->photoSize, st->photoSize); for (auto i = 0; i != storiesReadCount; ++i) {
segments.push_back({ storiesBrush, storiesLine });
}
for (auto i = 0; i != storiesUnreadCount; ++i) {
segments.push_back({ storiesUnreadBrush, storiesUnread });
}
Ui::PaintOutlineSegments(q, outline, segments);
} }
const auto &manager = data->layersManager; const auto &manager = data->layersManager;
if (const auto p = manager.progressForLayer(kBottomLayer); p > 0.) { if (const auto p = manager.progressForLayer(kBottomLayer); p > 0.) {
const auto size = context.st->photoSize; const auto size = photoSize;
if (data->cacheTTL.isNull() && peer->messagesTTL()) { if (data->cacheTTL.isNull() && peer->messagesTTL()) {
data->cacheTTL = CornerBadgeTTL(peer, view, size); data->cacheTTL = CornerBadgeTTL(peer, view, size);
} }
@ -430,8 +435,8 @@ void Row::PaintCornerBadgeFrame(
? st::dialogsOnlineBadgeFgActive ? st::dialogsOnlineBadgeFgActive
: st::dialogsOnlineBadgeFg); : st::dialogsOnlineBadgeFg);
q.drawEllipse(QRectF( q.drawEllipse(QRectF(
context.st->photoSize - skip.x() - size, photoSize - skip.x() - size,
context.st->photoSize - skip.y() - size, photoSize - skip.y() - size,
size, size,
size size
).marginsRemoved({ shrink, shrink, shrink, shrink })); ).marginsRemoved({ shrink, shrink, shrink, shrink }));
@ -451,11 +456,8 @@ void Row::paintUserpic(
const auto storiesUser = historyForCornerBadge const auto storiesUser = historyForCornerBadge
? historyForCornerBadge->peer->asUser() ? historyForCornerBadge->peer->asUser()
: nullptr; : nullptr;
const auto storiesShown = (storiesUser const auto storiesHas = storiesUser && storiesUser->hasActiveStories();
&& storiesUser->hasActiveStories()) ? 1 : 0; if (!historyForCornerBadge || (!cornerBadgeShown && !storiesHas)) {
const auto storiesUnread = (storiesShown
&& storiesUser->hasUnreadStories()) ? 1 : 0;
if (!historyForCornerBadge || (!cornerBadgeShown && !storiesShown)) {
BasicRow::paintUserpic( BasicRow::paintUserpic(
p, p,
peer, peer,
@ -476,6 +478,22 @@ void Row::paintUserpic(
const auto frameSide = (2 * framePadding + context.st->photoSize) const auto frameSide = (2 * framePadding + context.st->photoSize)
* ratio; * ratio;
const auto frameSize = QSize(frameSide, frameSide); const auto frameSize = QSize(frameSide, frameSide);
const auto storiesSource = storiesHas
? storiesUser->owner().stories().source(storiesUser->id)
: nullptr;
const auto storiesCountReal = storiesSource
? int(storiesSource->ids.size())
: storiesHas
? 1
: 0;
const auto storiesUnreadCountReal = storiesSource
? storiesSource->unreadCount()
: (storiesHas && storiesUser->hasUnreadStories())
? 1
: 0;
const auto limit = (1 << 7) - 1;
const auto storiesCount = std::min(storiesCountReal, limit);
const auto storiesUnreadCount = std::min(storiesUnreadCountReal, limit);
if (_cornerBadgeUserpic->frame.size() != frameSize) { if (_cornerBadgeUserpic->frame.size() != frameSize) {
_cornerBadgeUserpic->frame = QImage( _cornerBadgeUserpic->frame = QImage(
frameSize, frameSize,
@ -485,7 +503,8 @@ void Row::paintUserpic(
auto key = peer->userpicUniqueKey(userpicView()); auto key = peer->userpicUniqueKey(userpicView());
key.first += peer->messagesTTL(); key.first += peer->messagesTTL();
const auto frameIndex = videoUserpic ? videoUserpic->frameIndex() : -1; const auto frameIndex = videoUserpic ? videoUserpic->frameIndex() : -1;
const auto paletteVersion = style::PaletteVersion(); const auto paletteVersionReal = style::PaletteVersion();
const auto paletteVersion = (paletteVersionReal & ((1 << 17) - 1));
const auto active = context.active ? 1 : 0; const auto active = context.active ? 1 : 0;
const auto keyChanged = (_cornerBadgeUserpic->key != key) const auto keyChanged = (_cornerBadgeUserpic->key != key)
|| (_cornerBadgeUserpic->paletteVersion != paletteVersion); || (_cornerBadgeUserpic->paletteVersion != paletteVersion);
@ -496,14 +515,14 @@ void Row::paintUserpic(
|| !_cornerBadgeUserpic->layersManager.isFinished() || !_cornerBadgeUserpic->layersManager.isFinished()
|| _cornerBadgeUserpic->active != active || _cornerBadgeUserpic->active != active
|| _cornerBadgeUserpic->frameIndex != frameIndex || _cornerBadgeUserpic->frameIndex != frameIndex
|| _cornerBadgeUserpic->storiesShown != storiesShown || _cornerBadgeUserpic->storiesCount != storiesCount
|| _cornerBadgeUserpic->storiesUnread != storiesUnread || _cornerBadgeUserpic->storiesUnreadCount != storiesUnreadCount
|| videoUserpic) { || videoUserpic) {
_cornerBadgeUserpic->key = key; _cornerBadgeUserpic->key = key;
_cornerBadgeUserpic->paletteVersion = paletteVersion; _cornerBadgeUserpic->paletteVersion = paletteVersion;
_cornerBadgeUserpic->active = active; _cornerBadgeUserpic->active = active;
_cornerBadgeUserpic->storiesShown = storiesShown; _cornerBadgeUserpic->storiesCount = storiesCount;
_cornerBadgeUserpic->storiesUnread = storiesUnread; _cornerBadgeUserpic->storiesUnreadCount = storiesUnreadCount;
_cornerBadgeUserpic->frameIndex = frameIndex; _cornerBadgeUserpic->frameIndex = frameIndex;
_cornerBadgeUserpic->layersManager.markFrameShown(); _cornerBadgeUserpic->layersManager.markFrameShown();
PaintCornerBadgeFrame( PaintCornerBadgeFrame(

6
Telegram/SourceFiles/dialogs/dialogs_row.h
View File

@ -170,9 +170,9 @@ private:
QImage frame; QImage frame;
QImage cacheTTL; QImage cacheTTL;
int frameIndex = -1; int frameIndex = -1;
uint32 paletteVersion : 24 = 0; uint32 paletteVersion : 17 = 0;
uint32 storiesShown : 1 = 0; uint32 storiesCount : 7 = 0;
uint32 storiesUnread : 1 = 0; uint32 storiesUnreadCount : 7 = 0;
uint32 active : 1 = 0; uint32 active : 1 = 0;
}; };