mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 14:45:14 +00:00
Code Issues Releases Wiki Activity

Update icons for folders.

Browse Source
This commit is contained in:
John Preston
2022-03-04 14:25:25 +04:00
parent 37e5157d5a
commit a6d59fccf4
239 changed files with 72 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
View File

@@ -407,7 +407,10 @@ void CreateIconSelector(
) | rpl::start_with_next([=] {
auto p = QPainter(toggle);
const auto icons = Ui::LookupFilterIcon(*type);
icons.normal->paintInCenter(p, toggle->rect(), st::emojiIconFg->c);
icons.normal->paintInCenter(
p,
toggle->rect(),
st::dialogsUnreadBgMuted->c);
}, toggle->lifetime());
const auto panel = toggle->lifetime().make_state<Ui::FilterIconPanel>(

4
Telegram/SourceFiles/settings/settings_folders.cpp
View File

@@ -300,7 +300,9 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
st::settingsFilterIconLeft,
(height() - icon->height()) / 2,
width(),
(over ? st::menuIconFgOver : st::menuIconFg)->c);
(over
? st::dialogsUnreadBgMutedOver
: st::dialogsUnreadBgMuted)->c);
}
}

14
Telegram/SourceFiles/ui/filter_icon_panel.cpp
View File

@@ -105,7 +105,7 @@ void FilterIconPanel::setupInner() {
Ui::FillRoundRect(
p,
_inner->rect(),
st::emojiPanBg,
st::dialogsBg,
ImageRoundRadius::Small);
p.setFont(st::emojiPanHeaderFont);
p.setPen(st::emojiPanHeaderFg);
@@ -121,15 +121,21 @@ void FilterIconPanel::setupInner() {
if (!rect.intersects(clip)) {
continue;
}
if (i == selected) {
const auto over = (i == selected);
if (over) {
Ui::FillRoundRect(
p,
rect,
st::emojiPanHover,
st::dialogsBgOver,
Ui::StickerHoverCorners);
}
const auto icon = LookupFilterIcon(kIcons[i]).normal;
icon->paintInCenter(p, rect, st::emojiIconFg->c);
icon->paintInCenter(
p,
rect,
(over
? st::dialogsUnreadBgMutedOver
: st::dialogsUnreadBgMuted)->c);
}
}, _inner->lifetime());

94
Telegram/SourceFiles/ui/filter_icons.style
View File

@@ -7,52 +7,52 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
using "ui/colors.palette";
filtersAll: icon {{ "filters/filters_all", sideBarIconFg }};
filtersAllActive: icon {{ "filters/filters_all_active", sideBarIconFgActive }};
filtersUnread: icon {{ "filters/filters_unread", sideBarIconFg }};
filtersUnreadActive: icon {{ "filters/filters_unread_active", sideBarIconFgActive }};
filtersUnmuted: icon {{ "filters/filters_unmuted", sideBarIconFg }};
filtersUnmutedActive: icon {{ "filters/filters_unmuted_active", sideBarIconFgActive }};
filtersBots: icon {{ "filters/filters_bots", sideBarIconFg }};
filtersBotsActive: icon {{ "filters/filters_bots_active", sideBarIconFgActive }};
filtersChannels: icon {{ "filters/filters_channels", sideBarIconFg }};
filtersChannelsActive: icon {{ "filters/filters_channels_active", sideBarIconFgActive }};
filtersGroups: icon {{ "filters/filters_groups", sideBarIconFg }};
filtersGroupsActive: icon {{ "filters/filters_groups_active", sideBarIconFgActive }};
filtersPrivate: icon {{ "filters/filters_private", sideBarIconFg }};
filtersPrivateActive: icon {{ "filters/filters_private_active", sideBarIconFgActive }};
filtersCustom: icon {{ "filters/filters_custom", sideBarIconFg }};
filtersCustomActive: icon {{ "filters/filters_custom_active", sideBarIconFgActive }};
filtersSetup: icon {{ "filters/filters_setup", sideBarIconFg }};
filtersSetupActive: icon {{ "filters/filters_setup", sideBarIconFgActive }};
filtersAll: icon {{ "folders/folders_all", sideBarIconFg }};
filtersAllActive: icon {{ "folders/folders_all", sideBarIconFgActive }};
filtersUnread: icon {{ "folders/folders_unread", sideBarIconFg }};
filtersUnreadActive: icon {{ "folders/folders_unread", sideBarIconFgActive }};
filtersUnmuted: icon {{ "folders/folders_unmuted", sideBarIconFg }};
filtersUnmutedActive: icon {{ "folders/folders_unmuted", sideBarIconFgActive }};
filtersBots: icon {{ "folders/folders_bots", sideBarIconFg }};
filtersBotsActive: icon {{ "folders/folders_bots", sideBarIconFgActive }};
filtersChannels: icon {{ "folders/folders_channels", sideBarIconFg }};
filtersChannelsActive: icon {{ "folders/folders_channels", sideBarIconFgActive }};
filtersGroups: icon {{ "folders/folders_group", sideBarIconFg }};
filtersGroupsActive: icon {{ "folders/folders_group", sideBarIconFgActive }};
filtersPrivate: icon {{ "folders/folders_private", sideBarIconFg }};
filtersPrivateActive: icon {{ "folders/folders_private", sideBarIconFgActive }};
filtersCustom: icon {{ "folders/folders_custom", sideBarIconFg }};
filtersCustomActive: icon {{ "folders/folders_custom", sideBarIconFgActive }};
filtersSetup: icon {{ "folders/folders_setup", sideBarIconFg }};
filtersSetupActive: icon {{ "folders/folders_setup", sideBarIconFgActive }};
filtersEdit: icon {{ "filters/filters_edit", sideBarIconFg }};
filtersEdit: icon {{ "folders/folders_edit", sideBarIconFg }};
foldersCat: icon {{ "filters/folders_cat", sideBarIconFg }};
foldersCatActive: icon {{ "filters/folders_cat_active", sideBarIconFgActive }};
foldersCrown: icon {{ "filters/folders_crown", sideBarIconFg }};
foldersCrownActive: icon {{ "filters/folders_crown_active", sideBarIconFgActive }};
foldersFavorite: icon {{ "filters/folders_favorite", sideBarIconFg }};
foldersFavoriteActive: icon {{ "filters/folders_favorite_active", sideBarIconFgActive }};
foldersFlower: icon {{ "filters/folders_flower", sideBarIconFg }};
foldersFlowerActive: icon {{ "filters/folders_flower_active", sideBarIconFgActive }};
foldersGame: icon {{ "filters/folders_game", sideBarIconFg }};
foldersGameActive: icon {{ "filters/folders_game_active", sideBarIconFgActive }};
foldersHome: icon {{ "filters/folders_home", sideBarIconFg }};
foldersHomeActive: icon {{ "filters/folders_home_active", sideBarIconFgActive }};
foldersLove: icon {{ "filters/folders_love", sideBarIconFg }};
foldersLoveActive: icon {{ "filters/folders_love_active", sideBarIconFgActive }};
foldersMask: icon {{ "filters/folders_mask", sideBarIconFg }};
foldersMaskActive: icon {{ "filters/folders_mask_active", sideBarIconFgActive }};
foldersParty: icon {{ "filters/folders_party", sideBarIconFg }};
foldersPartyActive: icon {{ "filters/folders_party_active", sideBarIconFgActive }};
foldersSport: icon {{ "filters/folders_sport", sideBarIconFg }};
foldersSportActive: icon {{ "filters/folders_sport_active", sideBarIconFgActive }};
foldersStudy: icon {{ "filters/folders_study", sideBarIconFg }};
foldersStudyActive: icon {{ "filters/folders_study_active", sideBarIconFgActive }};
foldersTrade: icon {{ "filters/folders_trade", sideBarIconFg }};
foldersTradeActive: icon {{ "filters/folders_trade", sideBarIconFgActive }};
foldersTravel: icon {{ "filters/folders_travel", sideBarIconFg }};
foldersTravelActive: icon {{ "filters/folders_travel_active", sideBarIconFgActive }};
foldersWork: icon {{ "filters/folders_work", sideBarIconFg }};
foldersWorkActive: icon {{ "filters/folders_work_active", sideBarIconFgActive }};
foldersCat: icon {{ "folders/folders_cat", sideBarIconFg }};
foldersCatActive: icon {{ "folders/folders_cat", sideBarIconFgActive }};
foldersCrown: icon {{ "folders/folders_crown", sideBarIconFg }};
foldersCrownActive: icon {{ "folders/folders_crown", sideBarIconFgActive }};
foldersFavorite: icon {{ "folders/folders_favorite", sideBarIconFg }};
foldersFavoriteActive: icon {{ "folders/folders_favorite", sideBarIconFgActive }};
foldersFlower: icon {{ "folders/folders_flower", sideBarIconFg }};
foldersFlowerActive: icon {{ "folders/folders_flower", sideBarIconFgActive }};
foldersGame: icon {{ "folders/folders_game", sideBarIconFg }};
foldersGameActive: icon {{ "folders/folders_game", sideBarIconFgActive }};
foldersHome: icon {{ "folders/folders_home", sideBarIconFg }};
foldersHomeActive: icon {{ "folders/folders_home", sideBarIconFgActive }};
foldersLove: icon {{ "folders/folders_love", sideBarIconFg }};
foldersLoveActive: icon {{ "folders/folders_love", sideBarIconFgActive }};
foldersMask: icon {{ "folders/folders_mask", sideBarIconFg }};
foldersMaskActive: icon {{ "folders/folders_mask", sideBarIconFgActive }};
foldersParty: icon {{ "folders/folders_party", sideBarIconFg }};
foldersPartyActive: icon {{ "folders/folders_party", sideBarIconFgActive }};
foldersSport: icon {{ "folders/folders_sport", sideBarIconFg }};
foldersSportActive: icon {{ "folders/folders_sport", sideBarIconFgActive }};
foldersStudy: icon {{ "folders/folders_study", sideBarIconFg }};
foldersStudyActive: icon {{ "folders/folders_study", sideBarIconFgActive }};
foldersTrade: icon {{ "folders/folders_trade", sideBarIconFg }};
foldersTradeActive: icon {{ "folders/folders_trade", sideBarIconFgActive }};
foldersTravel: icon {{ "folders/folders_travel", sideBarIconFg }};
foldersTravelActive: icon {{ "folders/folders_travel", sideBarIconFgActive }};
foldersWork: icon {{ "folders/folders_work", sideBarIconFg }};
foldersWorkActive: icon {{ "folders/folders_work", sideBarIconFgActive }};

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

@@ -309,14 +309,14 @@ windwoFilterIconPanelPosition: point(-2px, -1px);
windowFilterIconSingle: size(44px, 42px);
windowFilterIconPadding: margins(10px, 36px, 10px, 8px);
windowFilterIconHeaderPosition: point(18px, 14px);
windowFilterTypeContacts: icon {{ "filters/filters_type_contacts", historyPeerUserpicFg }};
windowFilterTypeNonContacts: icon {{ "filters/filters_type_noncontacts", historyPeerUserpicFg }};
windowFilterTypeGroups: icon {{ "filters/filters_type_groups", historyPeerUserpicFg }};
windowFilterTypeChannels: icon {{ "filters/filters_type_channels", historyPeerUserpicFg }};
windowFilterTypeBots: icon {{ "filters/filters_type_bots", historyPeerUserpicFg }};
windowFilterTypeNoMuted: icon {{ "filters/filters_type_muted", historyPeerUserpicFg }};
windowFilterTypeNoArchived: icon {{ "filters/filters_type_archived", historyPeerUserpicFg }};
windowFilterTypeNoRead: icon {{ "filters/filters_type_read", historyPeerUserpicFg }};
windowFilterTypeContacts: icon {{ "folders/folders_type_contacts", historyPeerUserpicFg }};
windowFilterTypeNonContacts: icon {{ "folders/folders_type_noncontacts", historyPeerUserpicFg }};
windowFilterTypeGroups: icon {{ "folders/folders_type_groups", historyPeerUserpicFg }};
windowFilterTypeChannels: icon {{ "folders/folders_type_channels", historyPeerUserpicFg }};
windowFilterTypeBots: icon {{ "folders/folders_type_bots", historyPeerUserpicFg }};
windowFilterTypeNoMuted: icon {{ "folders/folders_type_muted", historyPeerUserpicFg }};
windowFilterTypeNoArchived: icon {{ "folders/folders_type_archived", historyPeerUserpicFg }};
windowFilterTypeNoRead: icon {{ "folders/folders_type_read", historyPeerUserpicFg }};
windowFilterChatsSectionSubtitle: FlatLabel(defaultFlatLabel) {
style: TextStyle(defaultTextStyle) {
font: searchedBarFont;