diff --git a/Telegram/Resources/icons/emoji_trending.png b/Telegram/Resources/icons/emoji_trending.png deleted file mode 100644 index 57f76185e..000000000 Binary files a/Telegram/Resources/icons/emoji_trending.png and /dev/null differ diff --git a/Telegram/Resources/icons/emoji_trending@2x.png b/Telegram/Resources/icons/emoji_trending@2x.png deleted file mode 100644 index 64a1d505c..000000000 Binary files a/Telegram/Resources/icons/emoji_trending@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/emoji_trending@3x.png b/Telegram/Resources/icons/emoji_trending@3x.png deleted file mode 100644 index fd3e107ed..000000000 Binary files a/Telegram/Resources/icons/emoji_trending@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/stickers_add.png b/Telegram/Resources/icons/stickers_add.png index ac6c2a166..39a2a9f6e 100644 Binary files a/Telegram/Resources/icons/stickers_add.png and b/Telegram/Resources/icons/stickers_add.png differ diff --git a/Telegram/Resources/icons/stickers_add@2x.png b/Telegram/Resources/icons/stickers_add@2x.png index de8948d66..3351e67a2 100644 Binary files a/Telegram/Resources/icons/stickers_add@2x.png and b/Telegram/Resources/icons/stickers_add@2x.png differ diff --git a/Telegram/Resources/icons/stickers_add@3x.png b/Telegram/Resources/icons/stickers_add@3x.png index de40bbad2..3b52aa36a 100644 Binary files a/Telegram/Resources/icons/stickers_add@3x.png and b/Telegram/Resources/icons/stickers_add@3x.png differ diff --git a/Telegram/Resources/icons/stickers_add_dot.png b/Telegram/Resources/icons/stickers_add_dot.png new file mode 100644 index 000000000..6bb2364b5 Binary files /dev/null and b/Telegram/Resources/icons/stickers_add_dot.png differ diff --git a/Telegram/Resources/icons/stickers_add_dot@2x.png b/Telegram/Resources/icons/stickers_add_dot@2x.png new file mode 100644 index 000000000..94a129bad Binary files /dev/null and b/Telegram/Resources/icons/stickers_add_dot@2x.png differ diff --git a/Telegram/Resources/icons/stickers_add_dot@3x.png b/Telegram/Resources/icons/stickers_add_dot@3x.png new file mode 100644 index 000000000..699d72914 Binary files /dev/null and b/Telegram/Resources/icons/stickers_add_dot@3x.png differ diff --git a/Telegram/Resources/icons/stickers_add_unread.png b/Telegram/Resources/icons/stickers_add_unread.png new file mode 100644 index 000000000..a6c899e13 Binary files /dev/null and b/Telegram/Resources/icons/stickers_add_unread.png differ diff --git a/Telegram/Resources/icons/stickers_add_unread@2x.png b/Telegram/Resources/icons/stickers_add_unread@2x.png new file mode 100644 index 000000000..db1b65583 Binary files /dev/null and b/Telegram/Resources/icons/stickers_add_unread@2x.png differ diff --git a/Telegram/Resources/icons/stickers_add_unread@3x.png b/Telegram/Resources/icons/stickers_add_unread@3x.png new file mode 100644 index 000000000..07e4b40c8 Binary files /dev/null and b/Telegram/Resources/icons/stickers_add_unread@3x.png differ diff --git a/Telegram/Resources/icons/stickers_recent.png b/Telegram/Resources/icons/stickers_recent.png new file mode 100644 index 000000000..287d06a6b Binary files /dev/null and b/Telegram/Resources/icons/stickers_recent.png differ diff --git a/Telegram/Resources/icons/stickers_recent@2x.png b/Telegram/Resources/icons/stickers_recent@2x.png new file mode 100644 index 000000000..aea8a48da Binary files /dev/null and b/Telegram/Resources/icons/stickers_recent@2x.png differ diff --git a/Telegram/Resources/icons/stickers_recent@3x.png b/Telegram/Resources/icons/stickers_recent@3x.png new file mode 100644 index 000000000..bbf9b57e4 Binary files /dev/null and b/Telegram/Resources/icons/stickers_recent@3x.png differ diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style index b691e5a60..dd99400d2 100644 --- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style +++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style @@ -89,11 +89,16 @@ stickersRowDisabledOpacity: 0.4; stickersRowDuration: 200; stickersSettings: icon {{ "emoji_settings", emojiIconFg }}; -stickersTrending: icon {{ "emoji_trending", emojiIconFg }}; +stickersTrending: icon {{ "stickers_add", emojiIconFg }}; +stickersTrendingUnread: icon { + { "stickers_add_unread", emojiIconFg }, + { "stickers_add_dot", dialogsUnreadBg } +}; +stickersRecent: icon {{ "stickers_recent", emojiIconFg }}; stickersSearch: icon {{ "stickers_search", emojiIconFg, point(0px, 1px) }}; -stickersSettingsUnreadSize: 17px; -stickersSettingsUnreadPosition: point(4px, 5px); +stickersSettingsUnreadSize: 6px; +stickersSettingsUnreadPosition: point(6px, 10px); filtersRemove: IconButton(stickersRemove) { ripple: defaultRippleAnimation; diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp index 918da350d..7682c72f4 100644 --- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp @@ -138,7 +138,6 @@ private: void finishDragging(); void paintStickerSettingsIcon(Painter &p) const; void paintSearchIcon(Painter &p) const; - void paintFeaturedStickerSetsBadge(Painter &p, int iconLeft) const; void paintSetIcon(Painter &p, const StickerIcon &icon, int x) const; void paintSelectionBar(Painter &p) const; void paintLeftRightFading(Painter &p) const; @@ -694,18 +693,6 @@ void StickersListWidget::Footer::paintSearchIcon(Painter &p) const { st::stickersSearch.paint(p, searchLeft + (st::stickerIconWidth - st::stickersSearch.width()) / 2, _iconsTop + st::emojiCategory.iconPosition.y(), width()); } -void StickersListWidget::Footer::paintFeaturedStickerSetsBadge(Painter &p, int iconLeft) const { - if (const auto unread = _pan->session().data().featuredStickerSetsUnreadCount()) { - Dialogs::Layout::UnreadBadgeStyle unreadSt; - unreadSt.sizeId = Dialogs::Layout::UnreadBadgeInStickersPanel; - unreadSt.size = st::stickersSettingsUnreadSize; - int unreadRight = iconLeft + st::stickerIconWidth - st::stickersSettingsUnreadPosition.x(); - if (rtl()) unreadRight = width() - unreadRight; - int unreadTop = _iconsTop + st::stickersSettingsUnreadPosition.y(); - Dialogs::Layout::paintUnreadCount(p, QString::number(unread), unreadRight, unreadTop, unreadSt); - } -} - void StickersListWidget::Footer::validateIconLottieAnimation( const StickerIcon &icon) { if (icon.lottie @@ -788,19 +775,22 @@ void StickersListWidget::Footer::paintSetIcon( } else if (icon.megagroup) { icon.megagroup->paintUserpicLeft(p, x + (st::stickerIconWidth - st::stickerGroupCategorySize) / 2, _iconsTop + (st::emojiFooterHeight - st::stickerGroupCategorySize) / 2, width(), st::stickerGroupCategorySize); } else { - auto getSpecialSetIcon = [](uint64 setId) { - if (setId == Stickers::FeaturedSetId) { - return &st::stickersTrending; + const auto paintedIcon = [&] { + if (icon.setId == Stickers::FeaturedSetId) { + const auto session = &_pan->session(); + return session->data().featuredStickerSetsUnreadCount() + ? &st::stickersTrendingUnread + : &st::stickersTrending; //} else if (setId == Stickers::FavedSetId) { // return &st::stickersFaved; } - return &st::emojiRecent; - }; - auto paintedIcon = getSpecialSetIcon(icon.setId); - paintedIcon->paint(p, x + (st::stickerIconWidth - paintedIcon->width()) / 2, _iconsTop + st::emojiCategory.iconPosition.y(), width()); - if (icon.setId == Stickers::FeaturedSetId) { - paintFeaturedStickerSetsBadge(p, x); - } + return &st::stickersRecent; + }(); + paintedIcon->paint( + p, + x + (st::stickerIconWidth - paintedIcon->width()) / 2, + _iconsTop + (st::emojiFooterHeight - paintedIcon->height()) / 2, + width()); } } @@ -2487,8 +2477,7 @@ void StickersListWidget::refreshMegagroupStickers(GroupStickersPlace place) { void StickersListWidget::fillIcons(QList &icons) { icons.clear(); icons.reserve(_mySets.size() + 1); - if (session().data().featuredStickerSetsUnreadCount() - && !_featuredSets.empty()) { + if (!_featuredSets.empty()) { icons.push_back(StickerIcon(Stickers::FeaturedSetId)); } @@ -2535,11 +2524,6 @@ void StickersListWidget::fillIcons(QList &icons) { pixw, pixh)); } - - if (!session().data().featuredStickerSetsUnreadCount() - && !_featuredSets.empty()) { - icons.push_back(StickerIcon(Stickers::FeaturedSetId)); - } } bool StickersListWidget::preventAutoHide() {