diff --git a/Telegram/Resources/icons/emoji_activity.png b/Telegram/Resources/icons/emoji_activity.png index 055ff9f33..0d1563284 100644 Binary files a/Telegram/Resources/icons/emoji_activity.png and b/Telegram/Resources/icons/emoji_activity.png differ diff --git a/Telegram/Resources/icons/emoji_activity@2x.png b/Telegram/Resources/icons/emoji_activity@2x.png index 681df82dd..fb2674515 100644 Binary files a/Telegram/Resources/icons/emoji_activity@2x.png and b/Telegram/Resources/icons/emoji_activity@2x.png differ diff --git a/Telegram/Resources/icons/emoji_faved.png b/Telegram/Resources/icons/emoji_faved.png new file mode 100644 index 000000000..38cd440bf Binary files /dev/null and b/Telegram/Resources/icons/emoji_faved.png differ diff --git a/Telegram/Resources/icons/emoji_faved@2x.png b/Telegram/Resources/icons/emoji_faved@2x.png new file mode 100644 index 000000000..5c92a8127 Binary files /dev/null and b/Telegram/Resources/icons/emoji_faved@2x.png differ diff --git a/Telegram/Resources/icons/emoji_food.png b/Telegram/Resources/icons/emoji_food.png index aeeccb7e1..1a6bb2a75 100644 Binary files a/Telegram/Resources/icons/emoji_food.png and b/Telegram/Resources/icons/emoji_food.png differ diff --git a/Telegram/Resources/icons/emoji_food@2x.png b/Telegram/Resources/icons/emoji_food@2x.png index 4f3d8cf78..654a0adc6 100644 Binary files a/Telegram/Resources/icons/emoji_food@2x.png and b/Telegram/Resources/icons/emoji_food@2x.png differ diff --git a/Telegram/Resources/icons/emoji_nature.png b/Telegram/Resources/icons/emoji_nature.png index 810cdf233..f13e2e9d6 100644 Binary files a/Telegram/Resources/icons/emoji_nature.png and b/Telegram/Resources/icons/emoji_nature.png differ diff --git a/Telegram/Resources/icons/emoji_nature@2x.png b/Telegram/Resources/icons/emoji_nature@2x.png index 308965ef3..136160bfd 100644 Binary files a/Telegram/Resources/icons/emoji_nature@2x.png and b/Telegram/Resources/icons/emoji_nature@2x.png differ diff --git a/Telegram/Resources/icons/emoji_objects.png b/Telegram/Resources/icons/emoji_objects.png index 29532ed51..622cfef3b 100644 Binary files a/Telegram/Resources/icons/emoji_objects.png and b/Telegram/Resources/icons/emoji_objects.png differ diff --git a/Telegram/Resources/icons/emoji_objects@2x.png b/Telegram/Resources/icons/emoji_objects@2x.png index 684c1cabc..e08934052 100644 Binary files a/Telegram/Resources/icons/emoji_objects@2x.png and b/Telegram/Resources/icons/emoji_objects@2x.png differ diff --git a/Telegram/Resources/icons/emoji_people.png b/Telegram/Resources/icons/emoji_people.png index 370c1dcee..bf02e88e4 100644 Binary files a/Telegram/Resources/icons/emoji_people.png and b/Telegram/Resources/icons/emoji_people.png differ diff --git a/Telegram/Resources/icons/emoji_people@2x.png b/Telegram/Resources/icons/emoji_people@2x.png index bd1cf36cb..0971b43e2 100644 Binary files a/Telegram/Resources/icons/emoji_people@2x.png and b/Telegram/Resources/icons/emoji_people@2x.png differ diff --git a/Telegram/Resources/icons/emoji_recent.png b/Telegram/Resources/icons/emoji_recent.png index 3a4e1854e..60bcb7008 100644 Binary files a/Telegram/Resources/icons/emoji_recent.png and b/Telegram/Resources/icons/emoji_recent.png differ diff --git a/Telegram/Resources/icons/emoji_recent@2x.png b/Telegram/Resources/icons/emoji_recent@2x.png index 4be3211d5..3135e13c2 100644 Binary files a/Telegram/Resources/icons/emoji_recent@2x.png and b/Telegram/Resources/icons/emoji_recent@2x.png differ diff --git a/Telegram/Resources/icons/emoji_settings.png b/Telegram/Resources/icons/emoji_settings.png index b454439fb..14473768f 100644 Binary files a/Telegram/Resources/icons/emoji_settings.png and b/Telegram/Resources/icons/emoji_settings.png differ diff --git a/Telegram/Resources/icons/emoji_settings@2x.png b/Telegram/Resources/icons/emoji_settings@2x.png index 534b24ac8..b75d6c9d9 100644 Binary files a/Telegram/Resources/icons/emoji_settings@2x.png and b/Telegram/Resources/icons/emoji_settings@2x.png differ diff --git a/Telegram/Resources/icons/emoji_symbols.png b/Telegram/Resources/icons/emoji_symbols.png index 496b76640..153a2a343 100644 Binary files a/Telegram/Resources/icons/emoji_symbols.png and b/Telegram/Resources/icons/emoji_symbols.png differ diff --git a/Telegram/Resources/icons/emoji_symbols@2x.png b/Telegram/Resources/icons/emoji_symbols@2x.png index d1e8861e3..58935218c 100644 Binary files a/Telegram/Resources/icons/emoji_symbols@2x.png and b/Telegram/Resources/icons/emoji_symbols@2x.png differ diff --git a/Telegram/Resources/icons/emoji_travel.png b/Telegram/Resources/icons/emoji_travel.png index 27c7674cf..525888d34 100644 Binary files a/Telegram/Resources/icons/emoji_travel.png and b/Telegram/Resources/icons/emoji_travel.png differ diff --git a/Telegram/Resources/icons/emoji_travel@2x.png b/Telegram/Resources/icons/emoji_travel@2x.png index 8958c7c62..27a78641d 100644 Binary files a/Telegram/Resources/icons/emoji_travel@2x.png and b/Telegram/Resources/icons/emoji_travel@2x.png differ diff --git a/Telegram/Resources/icons/emoji_trending.png b/Telegram/Resources/icons/emoji_trending.png index 4c76cf74a..c3e9c6ba7 100644 Binary files a/Telegram/Resources/icons/emoji_trending.png and b/Telegram/Resources/icons/emoji_trending.png differ diff --git a/Telegram/Resources/icons/emoji_trending@2x.png b/Telegram/Resources/icons/emoji_trending@2x.png index 3a3753703..70d42a77e 100644 Binary files a/Telegram/Resources/icons/emoji_trending@2x.png and b/Telegram/Resources/icons/emoji_trending@2x.png differ diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style index aca14e786..248158de9 100644 --- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style +++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style @@ -103,7 +103,7 @@ stickersRowDuration: 200; stickersSettings: icon {{ "emoji_settings", emojiIconFg }}; stickersTrending: icon {{ "emoji_trending", emojiIconFg }}; -stickersTrendingActive: icon {{ "emoji_trending", emojiIconFgActive }}; +stickersFaved: icon {{ "emoji_faved", emojiIconFg }}; stickersSettingsUnreadSize: 17px; stickersSettingsUnreadPosition: point(4px, 5px); @@ -137,7 +137,7 @@ emojiCategory: IconButton { width: 42px; height: 46px; - iconPosition: point(11px, 12px); + iconPosition: point(10px, 11px); } emojiCategoryRecent: IconButton(emojiCategory) { icon: emojiRecent; } emojiCategoryPeople: IconButton(emojiCategory) { icon: emojiPeople; } diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp index 6b4744b45..579a4f997 100644 --- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp @@ -208,13 +208,15 @@ void StickersListWidget::Footer::paintEvent(QPaintEvent *e) { p.drawPixmapLeft(x + (st::emojiCategory.width - icon.pixw) / 2, _iconsTop + (st::emojiCategory.height - icon.pixh) / 2, width(), pix); } else { - auto getSpecialSetIcon = [](uint64 setId, bool active) { + auto getSpecialSetIcon = [](uint64 setId) { if (setId == Stickers::FeaturedSetId) { - return active ? &st::stickersTrendingActive : &st::stickersTrending; + return &st::stickersTrending; + } else if (setId == Stickers::FavedSetId) { + return &st::stickersFaved; } - return active ? &st::emojiRecentActive : &st::emojiRecent; + return &st::emojiRecent; }; - getSpecialSetIcon(icon.setId, false)->paint(p, x + st::emojiCategory.iconPosition.x(), _iconsTop + st::emojiCategory.iconPosition.y(), width()); + getSpecialSetIcon(icon.setId)->paint(p, x + st::emojiCategory.iconPosition.x(), _iconsTop + st::emojiCategory.iconPosition.y(), width()); if (icon.setId == Stickers::FeaturedSetId) { paintFeaturedStickerSetsBadge(p, x); } @@ -1189,27 +1191,29 @@ void StickersListWidget::fillIcons(QList &icons) { icons.push_back(StickerIcon(Stickers::FeaturedSetId)); } - if (!_mySets.isEmpty()) { - int i = 0; - if (_mySets[0].id == Stickers::RecentSetId) { - ++i; - icons.push_back(StickerIcon(Stickers::RecentSetId)); - } - for (int l = _mySets.size(); i < l; ++i) { - auto s = _mySets[i].pack[0]; - int32 availw = st::emojiCategory.width - 2 * st::stickerIconPadding, availh = st::emojiCategory.height - 2 * st::stickerIconPadding; - int32 thumbw = s->thumb->width(), thumbh = s->thumb->height(), pixw = 1, pixh = 1; - if (availw * thumbh > availh * thumbw) { - pixh = availh; - pixw = (pixh * thumbw) / thumbh; - } else { - pixw = availw; - pixh = thumbw ? ((pixw * thumbh) / thumbw) : 1; - } - if (pixw < 1) pixw = 1; - if (pixh < 1) pixh = 1; - icons.push_back(StickerIcon(_mySets[i].id, s, pixw, pixh)); + auto i = 0; + if (i != _mySets.size() && _mySets[i].id == Stickers::RecentSetId) { + ++i; + icons.push_back(StickerIcon(Stickers::RecentSetId)); + } + if (i != _mySets.size() && _mySets[i].id == Stickers::FavedSetId) { + ++i; + icons.push_back(StickerIcon(Stickers::FavedSetId)); + } + for (auto l = _mySets.size(); i != l; ++i) { + auto s = _mySets[i].pack[0]; + auto availw = st::emojiCategory.width - 2 * st::stickerIconPadding, availh = st::emojiCategory.height - 2 * st::stickerIconPadding; + auto thumbw = s->thumb->width(), thumbh = s->thumb->height(), pixw = 1, pixh = 1; + if (availw * thumbh > availh * thumbw) { + pixh = availh; + pixw = (pixh * thumbw) / thumbh; + } else { + pixw = availw; + pixh = thumbw ? ((pixw * thumbh) / thumbw) : 1; } + if (pixw < 1) pixw = 1; + if (pixh < 1) pixh = 1; + icons.push_back(StickerIcon(_mySets[i].id, s, pixw, pixh)); } if (!Global::FeaturedStickerSetsUnreadCount() && !_featuredSets.isEmpty()) {