From 66b2bdd6567095161cb0303bd7dc3a6b610eddf8 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 15 Jul 2022 11:09:50 +0300 Subject: [PATCH] Improve footer custom emoji sizes. --- Telegram/SourceFiles/chat_helpers/chat_helpers.style | 3 ++- Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp | 4 ++-- Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp | 5 +---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style index 7426a1cc5..36d059b0e 100644 --- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style +++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style @@ -179,7 +179,8 @@ emojiSwitchColor: windowActiveTextFg; emojiSwitchStickers: icon {{ "emoji/emoji_switch", emojiSwitchColor }}; emojiSwitchEmoji: icon {{ "emoji/emoji_switch-flip_horizontal", emojiSwitchColor }}; -emojiIconSelectSkip: 2px; +emojiIconPadding: 8px; +emojiIconSelectSkip: 3px; hashtagClose: IconButton { width: 30px; diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp index 71a810200..34ee2957f 100644 --- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp @@ -1374,8 +1374,8 @@ std::vector EmojiListWidget::fillIcons() { for (const auto &custom : _custom) { const auto set = custom.set; const auto s = custom.thumbnailDocument; - const auto availw = st::stickerIconWidth - 2 * st::stickerIconPadding; - const auto availh = st::emojiFooterHeight - 2 * st::stickerIconPadding; + const auto availw = st::stickerIconWidth - 2 * st::emojiIconPadding; + const auto availh = st::emojiFooterHeight - 2 * st::emojiIconPadding; const auto size = set->hasThumbnail() ? QSize( set->thumbnailLocation().width(), diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp index a44f2df3e..91b85d503 100644 --- a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp +++ b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp @@ -1053,10 +1053,7 @@ void StickersListFooter::validateIconLottieAnimation( icon.thumbnailMedia.get(), icon.stickerMedia.get(), StickerLottieSize::StickersFooter, - QSize( - st::stickerIconWidth - 2 * st::stickerIconPadding, - st::emojiFooterHeight - 2 * st::stickerIconPadding - ) * cIntRetinaFactor(), + QSize(icon.pixw, icon.pixh) * cIntRetinaFactor(), _renderer()); if (!player) { return;