procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Show muted mention icon in archive.

This commit is contained in:
John Preston 2019-05-03 15:12:48 +04:00
parent 4356b1c193
commit 39b7f307a4
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,8 @@ void PaintNarrowCounter(
bool displayMentionBadge, bool displayMentionBadge,
int unreadCount, int unreadCount,
bool active, bool active,
bool unreadMuted) { bool unreadMuted,
bool mentionMuted) {
auto skipBeforeMention = 0; auto skipBeforeMention = 0;
if (displayUnreadCounter || displayUnreadMark) { if (displayUnreadCounter || displayUnreadMark) {
auto counter = (unreadCount > 0) auto counter = (unreadCount > 0)
@ -98,7 +99,7 @@ void PaintNarrowCounter(
UnreadBadgeStyle st; UnreadBadgeStyle st;
st.active = active; st.active = active;
st.muted = false; st.muted = mentionMuted;
st.padding = 0; st.padding = 0;
st.textTop = 0; st.textTop = 0;
paintUnreadCount(p, counter, unreadRight, unreadTop, st, &unreadWidth); paintUnreadCount(p, counter, unreadRight, unreadTop, st, &unreadWidth);
@ -117,7 +118,8 @@ int PaintWideCounter(
int unreadCount, int unreadCount,
bool active, bool active,
bool selected, bool selected,
bool unreadMuted) { bool unreadMuted,
bool mentionMuted) {
const auto initial = availableWidth; const auto initial = availableWidth;
auto hadOneBadge = false; auto hadOneBadge = false;
if (displayUnreadCounter || displayUnreadMark) { if (displayUnreadCounter || displayUnreadMark) {
@ -150,7 +152,7 @@ int PaintWideCounter(
UnreadBadgeStyle st; UnreadBadgeStyle st;
st.active = active; st.active = active;
st.muted = false; st.muted = mentionMuted;
st.padding = 0; st.padding = 0;
st.textTop = 0; st.textTop = 0;
paintUnreadCount(p, counter, unreadRight, unreadTop, st, &unreadWidth); paintUnreadCount(p, counter, unreadRight, unreadTop, st, &unreadWidth);
@ -580,6 +582,7 @@ void RowPainter::paint(
const auto unreadCount = entry->chatListUnreadCount(); const auto unreadCount = entry->chatListUnreadCount();
const auto unreadMark = entry->chatListUnreadMark(); const auto unreadMark = entry->chatListUnreadMark();
const auto unreadMuted = entry->chatListMutedBadge(); const auto unreadMuted = entry->chatListMutedBadge();
const auto mentionMuted = (entry->folder() != nullptr);
const auto item = entry->chatListMessage(); const auto item = entry->chatListMessage();
const auto cloudDraft = [&]() -> const Data::Draft*{ const auto cloudDraft = [&]() -> const Data::Draft*{
if (history && (!item || (!unreadCount && !unreadMark))) { if (history && (!item || (!unreadCount && !unreadMark))) {
@ -649,7 +652,8 @@ void RowPainter::paint(
unreadCount, unreadCount,
active, active,
selected, selected,
unreadMuted); unreadMuted,
mentionMuted);
const auto &color = active const auto &color = active
? st::dialogsTextFgServiceActive ? st::dialogsTextFgServiceActive
: (selected : (selected
@ -689,7 +693,8 @@ void RowPainter::paint(
displayMentionBadge, displayMentionBadge,
unreadCount, unreadCount,
active, active,
unreadMuted); unreadMuted,
mentionMuted);
}; };
paintRow( paintRow(
p, p,
@ -760,6 +765,7 @@ void RowPainter::paint(
const auto unreadMark = displayUnreadInfo const auto unreadMark = displayUnreadInfo
&& history->chatListUnreadMark(); && history->chatListUnreadMark();
const auto unreadMuted = history->chatListMutedBadge(); const auto unreadMuted = history->chatListMutedBadge();
const auto mentionMuted = (history->folder() != nullptr);
const auto displayMentionBadge = displayUnreadInfo const auto displayMentionBadge = displayUnreadInfo
&& history->hasUnreadMentions(); && history->hasUnreadMentions();
const auto displayUnreadCounter = (unreadCount > 0); const auto displayUnreadCounter = (unreadCount > 0);
@ -784,7 +790,8 @@ void RowPainter::paint(
unreadCount, unreadCount,
active, active,
selected, selected,
unreadMuted); unreadMuted,
mentionMuted);
const auto itemRect = QRect( const auto itemRect = QRect(
nameleft, nameleft,
@ -808,7 +815,8 @@ void RowPainter::paint(
displayMentionBadge, displayMentionBadge,
unreadCount, unreadCount,
active, active,
unreadMuted); unreadMuted,
mentionMuted);
}; };
const auto showSavedMessages = history->peer->isSelf() const auto showSavedMessages = history->peer->isSelf()
&& !row->searchInChat(); && !row->searchInChat();