void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed display of corner badges in narrowed mode when entry has unread.

Browse source
This commit is contained in:
23rd 2024-11-27 12:16:37 +03:00
parent eb821c1f36
commit 4e8e096fdb
3 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Telegram/SourceFiles/dialogs/dialogs_row.cpp
View file

@ -302,7 +302,8 @@ void BasicRow::paintUserpic(
not_null<Entry*> entry, not_null<Entry*> entry,
PeerData *peer, PeerData *peer,
Ui::VideoUserpic *videoUserpic, Ui::VideoUserpic *videoUserpic,
const Ui::PaintContext &context) const { const Ui::PaintContext &context,
bool hasUnreadBadgesAbove) const {
PaintUserpic(p, entry, peer, videoUserpic, _userpic, context); PaintUserpic(p, entry, peer, videoUserpic, _userpic, context);
} }
@ -371,12 +372,15 @@ void Row::setCornerBadgeShown(
void Row::updateCornerBadgeShown( void Row::updateCornerBadgeShown(
not_null<PeerData*> peer, not_null<PeerData*> peer,
Fn<void()> updateCallback) const { Fn<void()> updateCallback,
bool hasUnreadBadgesAbove) const {
const auto user = peer->asUser(); const auto user = peer->asUser();
const auto now = user ? base::unixtime::now() : TimeId(); const auto now = user ? base::unixtime::now() : TimeId();
const auto channel = user ? nullptr : peer->asChannel(); const auto channel = user ? nullptr : peer->asChannel();
const auto nextLayer = [&] { const auto nextLayer = [&] {
if (user && Data::IsUserOnline(user, now)) { if (hasUnreadBadgesAbove) {
return kNoneLayer;
} else if (user && Data::IsUserOnline(user, now)) {
return kTopLayer; return kTopLayer;
} else if (channel } else if (channel
&& (Data::ChannelHasActiveCall(channel) && (Data::ChannelHasActiveCall(channel)
@ -533,9 +537,10 @@ void Row::paintUserpic(
not_null<Entry*> entry, not_null<Entry*> entry,
PeerData *peer, PeerData *peer,
Ui::VideoUserpic *videoUserpic, Ui::VideoUserpic *videoUserpic,
const Ui::PaintContext &context) const { const Ui::PaintContext &context,
bool hasUnreadBadgesAbove) const {
if (peer) { if (peer) {
updateCornerBadgeShown(peer); updateCornerBadgeShown(peer, nullptr, hasUnreadBadgesAbove);
} }
const auto cornerBadgeShown = !_cornerBadgeUserpic const auto cornerBadgeShown = !_cornerBadgeUserpic
@ -551,7 +556,7 @@ void Row::paintUserpic(
? storiesFolder->storiesCount() ? storiesFolder->storiesCount()
: false; : false;
if (!cornerBadgeShown && !storiesHas) { if (!cornerBadgeShown && !storiesHas) {
BasicRow::paintUserpic(p, entry, peer, videoUserpic, context); BasicRow::paintUserpic(p, entry, peer, videoUserpic, context, false);
if (!peer || !_cornerBadgeShown) { if (!peer || !_cornerBadgeShown) {
_cornerBadgeUserpic = nullptr; _cornerBadgeUserpic = nullptr;
} }

9
Telegram/SourceFiles/dialogs/dialogs_row.h
View file

@ -51,7 +51,8 @@ public:
not_null<Entry*> entry, not_null<Entry*> entry,
PeerData *peer, PeerData *peer,
Ui::VideoUserpic *videoUserpic, Ui::VideoUserpic *videoUserpic,
const Ui::PaintContext &context) const; const Ui::PaintContext &context,
bool hasUnreadBadgesAbove) const;
void addRipple(QPoint origin, QSize size, Fn<void()> updateCallback); void addRipple(QPoint origin, QSize size, Fn<void()> updateCallback);
virtual void stopLastRipple(); virtual void stopLastRipple();
@ -98,13 +99,15 @@ public:
void updateCornerBadgeShown( void updateCornerBadgeShown(
not_null<PeerData*> peer, not_null<PeerData*> peer,
Fn<void()> updateCallback = nullptr) const; Fn<void()> updateCallback = nullptr,
bool hasUnreadBadgesAbove = false) const;
void paintUserpic( void paintUserpic(
Painter &p, Painter &p,
not_null<Entry*> entry, not_null<Entry*> entry,
PeerData *peer, PeerData *peer,
Ui::VideoUserpic *videoUserpic, Ui::VideoUserpic *videoUserpic,
const Ui::PaintContext &context) const final override; const Ui::PaintContext &context,
bool hasUnreadBadgesAbove) const final override;
[[nodiscard]] bool lookupIsInTopicJump(int x, int y) const; [[nodiscard]] bool lookupIsInTopicJump(int x, int y) const;
void stopLastRipple() override; void stopLastRipple() override;

12
Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
View file

@ -405,7 +405,17 @@ void PaintRow(
row->userpicView(), row->userpicView(),
context); context);
} else { } else {
row->paintUserpic(p, entry, from, videoUserpic, context); row->paintUserpic(
p,
entry,
from,
videoUserpic,
context,
context.narrow
&& !badgesState.empty()
&& !draft
&& item
&& !item->isEmpty());
} }
const auto nameleft = context.st->nameLeft; const auto nameleft = context.st->nameLeft;