diff --git a/Telegram/Resources/icons/filters/filters_edit.png b/Telegram/Resources/icons/filters/filters_edit.png new file mode 100644 index 000000000..853d5f598 Binary files /dev/null and b/Telegram/Resources/icons/filters/filters_edit.png differ diff --git a/Telegram/Resources/icons/filters/filters_edit@2x.png b/Telegram/Resources/icons/filters/filters_edit@2x.png new file mode 100644 index 000000000..2236b91f6 Binary files /dev/null and b/Telegram/Resources/icons/filters/filters_edit@2x.png differ diff --git a/Telegram/Resources/icons/filters/filters_edit@3x.png b/Telegram/Resources/icons/filters/filters_edit@3x.png new file mode 100644 index 000000000..28fd6076a Binary files /dev/null and b/Telegram/Resources/icons/filters/filters_edit@3x.png differ diff --git a/Telegram/SourceFiles/ui/filter_icons.cpp b/Telegram/SourceFiles/ui/filter_icons.cpp index 7ac99bc9a..83d84f943 100644 --- a/Telegram/SourceFiles/ui/filter_icons.cpp +++ b/Telegram/SourceFiles/ui/filter_icons.cpp @@ -130,6 +130,11 @@ const auto kIcons = std::vector<FilterIcons>{ &st::foldersWorkActive, "\xF0\x9F\x92\xBC"_cs.utf16() }, + { + &st::filtersEdit, + &st::filtersEdit, + QString() + } }; } // namespace @@ -145,6 +150,9 @@ std::optional<FilterIcon> LookupFilterIconByEmoji(const QString &emoji) { auto result = base::flat_map<EmojiPtr, FilterIcon>(); auto index = 0; for (const auto &entry : kIcons) { + if (entry.emoji.isEmpty()) { + continue; + } const auto emoji = Ui::Emoji::Find(entry.emoji); Assert(emoji != nullptr); result.emplace(emoji, static_cast<FilterIcon>(index++)); diff --git a/Telegram/SourceFiles/ui/filter_icons.h b/Telegram/SourceFiles/ui/filter_icons.h index fadde3f29..8c3aa09eb 100644 --- a/Telegram/SourceFiles/ui/filter_icons.h +++ b/Telegram/SourceFiles/ui/filter_icons.h @@ -44,6 +44,8 @@ enum class FilterIcon : uchar { Trade, Travel, Work, + + Edit, }; struct FilterIcons { diff --git a/Telegram/SourceFiles/ui/filter_icons.style b/Telegram/SourceFiles/ui/filter_icons.style index 288bd1b36..92227a0df 100644 --- a/Telegram/SourceFiles/ui/filter_icons.style +++ b/Telegram/SourceFiles/ui/filter_icons.style @@ -26,6 +26,8 @@ filtersCustomActive: icon {{ "filters/filters_custom_active", sideBarIconFgActiv filtersSetup: icon {{ "filters/filters_setup", sideBarIconFg }}; filtersSetupActive: icon {{ "filters/filters_setup", sideBarIconFgActive }}; +filtersEdit: icon {{ "filters/filters_edit", sideBarIconFg }}; + foldersCat: icon {{ "filters/folders_cat", sideBarIconFg }}; foldersCatActive: icon {{ "filters/folders_cat_active", sideBarIconFgActive }}; foldersCrown: icon {{ "filters/folders_crown", sideBarIconFg }}; diff --git a/Telegram/SourceFiles/window/window_filters_menu.cpp b/Telegram/SourceFiles/window/window_filters_menu.cpp index cca1a88ac..693224441 100644 --- a/Telegram/SourceFiles/window/window_filters_menu.cpp +++ b/Telegram/SourceFiles/window/window_filters_menu.cpp @@ -198,7 +198,7 @@ void FiltersMenu::setupList() { _container, -1, tr::lng_filters_setup(tr::now), - Ui::FilterIcon::Setup); + Ui::FilterIcon::Edit); _reorder = std::make_unique<Ui::VerticalLayoutReorder>(_list, &_scroll); _reorder->updates(