Improve trending stickers layout and position.

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;
+stickersSettingsUnreadSize: 6px;
-stickersSettingsUnreadPosition: point(4px, 5px);
+stickersSettingsUnreadPosition: point(6px, 10px);
 
 filtersRemove: IconButton(stickersRemove) {
 	ripple: defaultRippleAnimation;

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) {
+		const auto paintedIcon = [&] {
-			if (setId == Stickers::FeaturedSetId) {
+			if (icon.setId == Stickers::FeaturedSetId) {
-				return &st::stickersTrending;
+				const auto session = &_pan->session();
+				return session->data().featuredStickerSetsUnreadCount()
+					? &st::stickersTrendingUnread
+					: &st::stickersTrending;
 			//} else if (setId == Stickers::FavedSetId) {
 			//	return &st::stickersFaved;
 			}
-			return &st::emojiRecent;
+			return &st::stickersRecent;
-		};
+		}();
-		auto paintedIcon = getSpecialSetIcon(icon.setId);
+		paintedIcon->paint(
-		paintedIcon->paint(p, x + (st::stickerIconWidth - paintedIcon->width()) / 2, _iconsTop + st::emojiCategory.iconPosition.y(), width());
+			p,
-		if (icon.setId == Stickers::FeaturedSetId) {
+			x + (st::stickerIconWidth - paintedIcon->width()) / 2,
-			paintFeaturedStickerSetsBadge(p, x);
+			_iconsTop + (st::emojiFooterHeight - paintedIcon->height()) / 2,
-		}
+			width());
 	}
 }
 
@@ -2487,8 +2477,7 @@ void StickersListWidget::refreshMegagroupStickers(GroupStickersPlace place) {
 void StickersListWidget::fillIcons(QList<StickerIcon> &icons) {
 	icons.clear();
 	icons.reserve(_mySets.size() + 1);
-	if (session().data().featuredStickerSetsUnreadCount()
+	if (!_featuredSets.empty()) {
-		&& !_featuredSets.empty()) {
 		icons.push_back(StickerIcon(Stickers::FeaturedSetId));
 	}
 
@@ -2535,11 +2524,6 @@ void StickersListWidget::fillIcons(QList<StickerIcon> &icons) {
 			pixw,
 			pixh));
 	}
-
-	if (!session().data().featuredStickerSetsUnreadCount()
-		&& !_featuredSets.empty()) {
-		icons.push_back(StickerIcon(Stickers::FeaturedSetId));
-	}
 }
 
 bool StickersListWidget::preventAutoHide() {