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 counting of unread topics from unread state in filters.

Browse source
This commit is contained in:
23rd 2024-11-25 17:44:49 +03:00
parent 021a5881c2
commit f888008dc1
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Telegram/SourceFiles/data/data_forum_topic.cpp
View file

@ -897,6 +897,7 @@ Dialogs::UnreadState ForumTopic::unreadStateFor(
const auto muted = this->muted(); const auto muted = this->muted();
result.messages = count; result.messages = count;
result.chats = count ? 1 : 0; result.chats = count ? 1 : 0;
result.chatsTopic = count ? 1 : 0;
result.mentions = unreadMentions().has() ? 1 : 0; result.mentions = unreadMentions().has() ? 1 : 0;
result.reactions = unreadReactions().has() ? 1 : 0; result.reactions = unreadReactions().has() ? 1 : 0;
result.messagesMuted = muted ? result.messages : 0; result.messagesMuted = muted ? result.messages : 0;

3
Telegram/SourceFiles/dialogs/dialogs_entry.h
View file

@ -65,6 +65,7 @@ struct UnreadState {
int messagesMuted = 0; int messagesMuted = 0;
int chats = 0; int chats = 0;
int chatsMuted = 0; int chatsMuted = 0;
int chatsTopic = 0;
int marks = 0; int marks = 0;
int marksMuted = 0; int marksMuted = 0;
int reactions = 0; int reactions = 0;
@ -77,6 +78,7 @@ struct UnreadState {
messagesMuted += other.messagesMuted; messagesMuted += other.messagesMuted;
chats += other.chats; chats += other.chats;
chatsMuted += other.chatsMuted; chatsMuted += other.chatsMuted;
chatsTopic += other.chatsTopic;
marks += other.marks; marks += other.marks;
marksMuted += other.marksMuted; marksMuted += other.marksMuted;
reactions += other.reactions; reactions += other.reactions;
@ -89,6 +91,7 @@ struct UnreadState {
messagesMuted -= other.messagesMuted; messagesMuted -= other.messagesMuted;
chats -= other.chats; chats -= other.chats;
chatsMuted -= other.chatsMuted; chatsMuted -= other.chatsMuted;
chatsTopic -= other.chatsTopic;
marks -= other.marks; marks -= other.marks;
marksMuted -= other.marksMuted; marksMuted -= other.marksMuted;
reactions -= other.reactions; reactions -= other.reactions;

5
Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
View file

@ -337,8 +337,11 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
) | rpl::start_with_next([=]( ) | rpl::start_with_next([=](
const Dialogs::UnreadState &state, const Dialogs::UnreadState &state,
bool includeMuted) { bool includeMuted) {
const auto chats = state.chatsTopic
? (state.chats - state.chatsTopic + 1)
: state.chats;
const auto muted = (state.chatsMuted + state.marksMuted); const auto muted = (state.chatsMuted + state.marksMuted);
const auto count = (state.chats + state.marks) const auto count = (chats + state.marks)
- (includeMuted ? 0 : muted); - (includeMuted ? 0 : muted);
const auto isMuted = includeMuted && (count == muted); const auto isMuted = includeMuted && (count == muted);
slider->setUnreadCount(i, count, isMuted); slider->setUnreadCount(i, count, isMuted);

5
Telegram/SourceFiles/window/window_filters_menu.cpp
View file

@ -270,8 +270,11 @@ base::unique_qptr<Ui::SideBarButton> FiltersMenu::prepareButton(
) | rpl::start_with_next([=]( ) | rpl::start_with_next([=](
const Dialogs::UnreadState &state, const Dialogs::UnreadState &state,
bool includeMuted) { bool includeMuted) {
const auto chats = state.chatsTopic
? (state.chats - state.chatsTopic + 1)
: state.chats;
const auto muted = (state.chatsMuted + state.marksMuted); const auto muted = (state.chatsMuted + state.marksMuted);
const auto count = (state.chats + state.marks) const auto count = (chats + state.marks)
- (includeMuted ? 0 : muted); - (includeMuted ? 0 : muted);
const auto string = !count const auto string = !count
? QString() ? QString()