FOSS/AyuGramDesktop
1
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2026-07-25 06:54:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaced badge-based dialogs icons with standalone colored icons.

Browse Source
This commit is contained in:
23rd
2026-03-24 22:55:49 +03:00
parent cbf8f791bb
commit db8878932f
8 changed files with 65 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Telegram/Resources/icons/poll/filled/filled_chatlist_mention.svg → Telegram/Resources/icons/dialogs/dialogs_chatlist_mention.svg
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Telegram/Resources/icons/poll/filled/filled_chatlist_poll.svg → Telegram/Resources/icons/dialogs/dialogs_chatlist_poll.svg
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 949 B

After

Width:  |  Height:  |  Size: 949 B

Telegram/Resources/icons/poll/filled/filled_chatlist_reaction.svg → Telegram/Resources/icons/dialogs/dialogs_chatlist_reaction.svg
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1000 B

After

Width:  |  Height:  |  Size: 1000 B

Telegram/SourceFiles/boxes/polls.style
-3
View File
@@ -93,12 +93,9 @@ pollBoxMenuPollOrderIcon: icon{{ "poll/general/menu_poll_order-24x24", historyCo
pollBoxFilledPollDeadlineIcon: icon{{ "poll/filled/filled_poll_deadline", activeButtonFg }};
pollBoxFilledPollViewIcon: icon{{ "poll/filled/filled_poll_view", activeButtonFg }};
pollBoxFilledPollAddIcon: icon{{ "poll/filled/filled_poll_add", activeButtonFg }};
pollBoxFilledChatlistPollIcon: icon{{ "poll/filled/filled_chatlist_poll", activeButtonFg }};
pollBoxFilledPollCorrectIcon: icon{{ "poll/filled/filled_poll_correct", activeButtonFg }};
pollBoxFilledChatlistReactionIcon: icon{{ "poll/filled/filled_chatlist_reaction", activeButtonFg }};
pollBoxFilledPollRevoteIcon: icon{{ "poll/filled/filled_poll_revote", activeButtonFg }};
pollBoxFilledPollShuffleIcon: icon{{ "poll/filled/filled_poll_shuffle", activeButtonFg }};
pollBoxFilledChatlistMentionIcon: icon{{ "poll/filled/filled_chatlist_mention", activeButtonFg }};
pollBoxFilledPollMultipleIcon: icon{{ "poll/filled/filled_poll_multiple", activeButtonFg }};
pollAttachTextSkip: 28px;
Telegram/SourceFiles/dialogs/dialogs.style
+24 -9
View File
@@ -577,19 +577,34 @@ dialogsMiniReplyStory: DialogsMiniIcon {
}
dialogsUnreadMention: ThreeStateIcon {
icon: icon{{ "dialogs/dialogs_mention", dialogsUnreadFg }};
over: icon{{ "dialogs/dialogs_mention", dialogsUnreadFgOver }};
active: icon{{ "dialogs/dialogs_mention", dialogsUnreadFgActive }};
icon: icon{{ "dialogs/dialogs_chatlist_mention-18x18", dialogsMentionIconFg }};
over: icon{{ "dialogs/dialogs_chatlist_mention-18x18", dialogsMentionIconFg }};
active: icon{{ "dialogs/dialogs_chatlist_mention-18x18", dialogsNameFgActive }};
}
dialogsUnreadMentionMuted: ThreeStateIcon {
icon: icon{{ "dialogs/dialogs_chatlist_mention-18x18", dialogsUnreadBgMuted }};
over: icon{{ "dialogs/dialogs_chatlist_mention-18x18", dialogsUnreadBgMutedOver }};
active: icon{{ "dialogs/dialogs_chatlist_mention-18x18", dialogsUnreadBgMutedActive }};
}
dialogsUnreadReaction: ThreeStateIcon {
icon: icon{{ "dialogs/dialogs_reaction", dialogsUnreadFg }};
over: icon{{ "dialogs/dialogs_reaction", dialogsUnreadFgOver }};
active: icon{{ "dialogs/dialogs_reaction", dialogsUnreadFgActive }};
icon: icon{{ "dialogs/dialogs_chatlist_reaction-18x18", dialogsReactionIconFg }};
over: icon{{ "dialogs/dialogs_chatlist_reaction-18x18", dialogsReactionIconFg }};
active: icon{{ "dialogs/dialogs_chatlist_reaction-18x18", dialogsNameFgActive }};
}
dialogsUnreadReactionMuted: ThreeStateIcon {
icon: icon{{ "dialogs/dialogs_chatlist_reaction-18x18", dialogsUnreadBgMuted }};
over: icon{{ "dialogs/dialogs_chatlist_reaction-18x18", dialogsUnreadBgMutedOver }};
active: icon{{ "dialogs/dialogs_chatlist_reaction-18x18", dialogsUnreadBgMutedActive }};
}
dialogsUnreadPoll: ThreeStateIcon {
icon: icon{{ "poll/filled/filled_chatlist_poll-18x18", dialogsUnreadFg }};
over: icon{{ "poll/filled/filled_chatlist_poll-18x18", dialogsUnreadFgOver }};
active: icon{{ "poll/filled/filled_chatlist_poll-18x18", dialogsUnreadFgActive }};
icon: icon{{ "dialogs/dialogs_chatlist_poll-18x18", dialogsPollIconFg }};
over: icon{{ "dialogs/dialogs_chatlist_poll-18x18", dialogsPollIconFg }};
active: icon{{ "dialogs/dialogs_chatlist_poll-18x18", dialogsNameFgActive }};
}
dialogsUnreadPollMuted: ThreeStateIcon {
icon: icon{{ "dialogs/dialogs_chatlist_poll-18x18", dialogsUnreadBgMuted }};
over: icon{{ "dialogs/dialogs_chatlist_poll-18x18", dialogsUnreadBgMutedOver }};
active: icon{{ "dialogs/dialogs_chatlist_poll-18x18", dialogsUnreadBgMutedActive }};
}
downloadBarHeight: 46px;
Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
+20 -31
View File
@@ -199,42 +199,31 @@ int PaintBadges(
right -= icon.width() + st::dialogsUnreadPadding;
}
if (badgesState.mention || badgesState.reaction) {
UnreadBadgeStyle st;
st.sizeId = badgesState.mention
? UnreadBadgeSize::Dialogs
: UnreadBadgeSize::ReactionInDialogs;
st.active = context.active;
st.selected = context.selected;
st.muted = badgesState.mention
const auto muted = badgesState.mention
? badgesState.mentionMuted
: badgesState.reactionMuted;
st.padding = 0;
st.textTop = 0;
const auto counter = QString();
const auto badge = PaintUnreadBadge(p, counter, right, top, st);
ThreeStateIcon(
const auto &icon = ThreeStateIcon(
badgesState.mention
? st::dialogsUnreadMention
: st::dialogsUnreadReaction,
st.active,
st.selected).paintInCenter(p, badge);
right -= badge.width() + st.padding + st::dialogsUnreadPadding;
? (muted
? st::dialogsUnreadMentionMuted
: st::dialogsUnreadMention)
: (muted
? st::dialogsUnreadReactionMuted
: st::dialogsUnreadReaction),
context.active,
context.selected);
icon.paint(p, right - icon.width(), top, context.width);
right -= icon.width() + st::dialogsUnreadPadding;
}
if (badgesState.poll) {
UnreadBadgeStyle st;
st.sizeId = UnreadBadgeSize::ReactionInDialogs;
st.active = context.active;
st.selected = context.selected;
st.muted = badgesState.pollMuted;
st.padding = 0;
st.textTop = 0;
const auto counter = QString();
const auto badge = PaintUnreadBadge(p, counter, right, top, st);
ThreeStateIcon(
st::dialogsUnreadPoll,
st.active,
st.selected).paintInCenter(p, badge);
right -= badge.width() + st.padding + st::dialogsUnreadPadding;
const auto &icon = ThreeStateIcon(
badgesState.pollMuted
? st::dialogsUnreadPollMuted
: st::dialogsUnreadPoll,
context.active,
context.selected);
icon.paint(p, right - icon.width(), top, context.width);
right -= icon.width() + st::dialogsUnreadPadding;
}
return (initial - right);
}
Telegram/SourceFiles/ui/controls/subsection_tabs_slider.cpp
+20 -26
View File
@@ -263,21 +263,18 @@ void VerticalButton::paintEvent(QPaintEvent *e) {
right -= badge.width() + st.padding;
}
if (state.mention || state.reaction) {
UnreadBadgeStyle st;
st.sizeId = state.mention
? UnreadBadgeSize::Dialogs
: UnreadBadgeSize::ReactionInDialogs;
st.muted = state.mention
const auto muted = state.mention
? state.mentionMuted
: state.reactionMuted;
st.padding = 0;
st.textTop = 0;
const auto counter = QString();
const auto badge = PaintUnreadBadge(p, counter, right, top, st);
(state.mention
? st::dialogsUnreadMention.icon
: st::dialogsUnreadReaction.icon).paintInCenter(p, badge);
right -= badge.width() + st.padding + st::dialogsUnreadPadding;
const auto &icon = state.mention
? (muted
? st::dialogsUnreadMentionMuted.icon
: st::dialogsUnreadMention.icon)
: (muted
? st::dialogsUnreadReactionMuted.icon
: st::dialogsUnreadReaction.icon);
icon.paint(p, right - icon.width(), top, width());
right -= icon.width() + st::dialogsUnreadPadding;
}
if (isPinned() && isFirstPinned()) {
PaintPinnedIcon(p, width(), _backgroundMargin);
@@ -443,21 +440,18 @@ void HorizontalButton::paintEvent(QPaintEvent *e) {
right -= badge.width() + st.padding;
}
if (state.mention || state.reaction) {
UnreadBadgeStyle st;
st.sizeId = state.mention
? UnreadBadgeSize::Dialogs
: UnreadBadgeSize::ReactionInDialogs;
st.muted = state.mention
const auto muted = state.mention
? state.mentionMuted
: state.reactionMuted;
st.padding = 0;
st.textTop = 0;
const auto counter = QString();
const auto badge = PaintUnreadBadge(p, counter, right, badgeTop, st);
(state.mention
? st::dialogsUnreadMention.icon
: st::dialogsUnreadReaction.icon).paintInCenter(p, badge);
right -= badge.width() + st.padding + st::dialogsUnreadPadding;
const auto &icon = state.mention
? (muted
? st::dialogsUnreadMentionMuted.icon
: st::dialogsUnreadMention.icon)
: (muted
? st::dialogsUnreadReactionMuted.icon
: st::dialogsUnreadReaction.icon);
icon.paint(p, right - icon.width(), badgeTop, width());
right -= icon.width() + st::dialogsUnreadPadding;
}
if (isPinned() && isFirstPinned()) {
Telegram/lib_ui
+1 -1
Submodule Telegram/lib_ui updated: 5977759c8a...673106851d