From 841ddcefab286cada665d9db40d25adb2cca0b92 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Tue, 31 Jan 2023 19:53:27 +0300 Subject: [PATCH] Simplified icon of toggle button in selector of userpic emoji builder. --- .../info/userpic/info_userpic_builder.style | 2 -- .../info_userpic_emoji_builder_widget.cpp | 17 ++--------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_builder.style b/Telegram/SourceFiles/info/userpic/info_userpic_builder.style index c933bb518..ccf788419 100644 --- a/Telegram/SourceFiles/info/userpic/info_userpic_builder.style +++ b/Telegram/SourceFiles/info/userpic/info_userpic_builder.style @@ -65,8 +65,6 @@ userpicBuilderEmojiColorPlus: IconButton(userpicBuilderEmojiColorMinus) { iconOver: icon {{ "settings/plus", menuIconFg }}; } -userpicBuilderEmojiToggleEmojiIcon: icon {{ "chat/input_smile_face", emojiIconFg }}; -userpicBuilderEmojiToggleEmojiSize: 18px; userpicBuilderEmojiToggleStickersIcon: icon {{ "menu/stickers", emojiIconFg }}; userpicBuilderEmojiSlideDuration: 120; diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp index 565a3af7e..b06eadb8e 100644 --- a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp +++ b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp @@ -272,23 +272,10 @@ void EmojiSelector::createSelector(Type type) { const auto r = toggleButton->rect() - QMargins(pos.x(), pos.y(), pos.x(), pos.y()); p.fillRect(r, st::boxBg); - const auto &icon = st::userpicBuilderEmojiToggleStickersIcon; if (isEmoji) { - icon.paintInCenter(p, r); + st::userpicBuilderEmojiToggleStickersIcon.paintInCenter(p, r); } else { - st::userpicBuilderEmojiToggleEmojiIcon.paintInCenter(p, r); - const auto line = style::ConvertScaleExact( - st::historyEmojiCircleLine); - p.setPen(QPen( - st::emojiIconFg, - line, - Qt::SolidLine, - Qt::RoundCap)); - p.setBrush(Qt::NoBrush); - PainterHighQualityEnabler hq(p); - const auto diff = (icon.width() - - st::userpicBuilderEmojiToggleEmojiSize) / 2; - p.drawEllipse(r - Margins(diff)); + st::emojiPeople.paintInCenter(p, r); } }, toggleButton->lifetime()); }