mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Show different filter icons.

Browse Source
This commit is contained in:
John Preston
2020-03-10 17:02:23 +04:00
parent 2fb2fa9661
commit a091e73686
26 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Telegram/SourceFiles/window/window.style
View File

@@ -276,6 +276,22 @@ windowFiltersUnmuted: SideBarButton(windowFiltersButton) {
icon: icon {{ "filters_unmuted", sideBarIconFg }};
iconActive: icon {{ "filters_unmuted_active", sideBarIconFgActive }};
}
windowFiltersBots: SideBarButton(windowFiltersButton) {
icon: icon {{ "filters_bots", sideBarIconFg }};
iconActive: icon {{ "filters_bots_active", sideBarIconFgActive }};
}
windowFiltersChannels: SideBarButton(windowFiltersButton) {
icon: icon {{ "filters_channels", sideBarIconFg }};
iconActive: icon {{ "filters_channels_active", sideBarIconFgActive }};
}
windowFiltersGroups: SideBarButton(windowFiltersButton) {
icon: icon {{ "filters_groups", sideBarIconFg }};
iconActive: icon {{ "filters_groups_active", sideBarIconFgActive }};
}
windowFiltersPrivate: SideBarButton(windowFiltersButton) {
icon: icon {{ "filters_private", sideBarIconFg }};
iconActive: icon {{ "filters_private_active", sideBarIconFgActive }};
}
windowFiltersCustom: SideBarButton(windowFiltersButton) {
icon: icon {{ "filters_custom", sideBarIconFg }};
iconActive: icon {{ "filters_custom_active", sideBarIconFgActive }};

28
Telegram/SourceFiles/window/window_filters_menu.cpp
View File

@@ -24,6 +24,10 @@ namespace {
enum class Type {
Unread,
Unmuted,
People,
Groups,
Channels,
Bots,
Custom,
};
@@ -35,12 +39,26 @@ enum class Type {
| Flag::Groups
| Flag::Broadcasts
| Flag::Bots;
const auto removed = Flag::NoRead | Flag::NoMuted;
const auto people = Flag::Contacts | Flag::NonContacts;
const auto allNoArchive = all | Flag::NoArchive;
if (!filter.always().empty() || !filter.never().empty()) {
if (!filter.always().empty()
|| !filter.never().empty()
|| !(filter.flags() & all)) {
return Type::Custom;
} else if (filter.flags() == (all | Flag::NoRead)) {
} else if ((filter.flags() & all) == Flag::Contacts
|| (filter.flags() & all) == Flag::NonContacts
|| (filter.flags() & all) == people) {
return Type::People;
} else if ((filter.flags() & all) == Flag::Groups) {
return Type::Groups;
} else if ((filter.flags() & all) == Flag::Broadcasts) {
return Type::Channels;
} else if ((filter.flags() & all) == Flag::Bots) {
return Type::Bots;
} else if ((filter.flags() & removed) == Flag::NoRead) {
return Type::Unread;
} else if (filter.flags() == (all | Flag::NoMuted)) {
} else if ((filter.flags() & removed) == Flag::NoMuted) {
return Type::Unmuted;
}
return Type::Custom;
@@ -50,6 +68,10 @@ enum class Type {
switch (type) {
case Type::Unread: return st::windowFiltersUnread;
case Type::Unmuted: return st::windowFiltersUnmuted;
case Type::People: return st::windowFiltersPrivate;
case Type::Groups: return st::windowFiltersGroups;
case Type::Channels: return st::windowFiltersChannels;
case Type::Bots: return st::windowFiltersBots;
case Type::Custom: return st::windowFiltersCustom;
}
Unexpected("Filter type in FiltersMenu::refresh.");