diff --git a/Telegram/Resources/icons/stickers_empty.png b/Telegram/Resources/icons/stickers_empty.png index b973c8dcc..88023220e 100644 Binary files a/Telegram/Resources/icons/stickers_empty.png and b/Telegram/Resources/icons/stickers_empty.png differ diff --git a/Telegram/Resources/icons/stickers_empty@2x.png b/Telegram/Resources/icons/stickers_empty@2x.png index 5b064d0fe..8f684d66c 100644 Binary files a/Telegram/Resources/icons/stickers_empty@2x.png and b/Telegram/Resources/icons/stickers_empty@2x.png differ diff --git a/Telegram/Resources/icons/stickers_search.png b/Telegram/Resources/icons/stickers_search.png new file mode 100644 index 000000000..d451df620 Binary files /dev/null and b/Telegram/Resources/icons/stickers_search.png differ diff --git a/Telegram/Resources/icons/stickers_search@2x.png b/Telegram/Resources/icons/stickers_search@2x.png new file mode 100644 index 000000000..723dfc088 Binary files /dev/null and b/Telegram/Resources/icons/stickers_search@2x.png differ diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style index 80655148e..b673bcd1e 100644 --- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style +++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style @@ -90,8 +90,7 @@ stickersRowDuration: 200; stickersSettings: icon {{ "emoji_settings", emojiIconFg }}; stickersTrending: icon {{ "emoji_trending", emojiIconFg }}; -stickersFaved: icon {{ "emoji_faved", emojiIconFg }}; -stickersSearch: icon {{ "title_search", emojiIconFg, point(0px, 5px) }}; +stickersSearch: icon {{ "stickers_search", emojiIconFg, point(0px, 1px) }}; stickersSettingsUnreadSize: 17px; stickersSettingsUnreadPosition: point(4px, 5px); diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp index 8a7b970bc..19ff63ab3 100644 --- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp @@ -619,8 +619,8 @@ void StickersListWidget::Footer::paintSetIcon( auto getSpecialSetIcon = [](uint64 setId) { if (setId == Stickers::FeaturedSetId) { return &st::stickersTrending; - } else if (setId == Stickers::FavedSetId) { - return &st::stickersFaved; + //} else if (setId == Stickers::FavedSetId) { + // return &st::stickersFaved; } return &st::emojiRecent; }; @@ -1252,7 +1252,7 @@ void StickersListWidget::paintEmptySearchResults(Painter &p) { p.setPen(st::windowSubTextFg); p.drawTextLeft( (width() - textWidth) / 2, - iconTop + st::stickersEmpty.height() + st::normalFont->height, + iconTop + st::stickersEmpty.height() - st::normalFont->height, width(), text, textWidth); @@ -1997,7 +1997,9 @@ void StickersListWidget::fillIcons(QList &icons) { } if (i != _mySets.size() && _mySets[i].id == Stickers::RecentSetId) { ++i; - icons.push_back(StickerIcon(Stickers::RecentSetId)); + if (!icons.empty() && icons.back().setId != Stickers::FavedSetId) { + icons.push_back(StickerIcon(Stickers::RecentSetId)); + } } for (auto l = _mySets.size(); i != l; ++i) { if (_mySets[i].id == Stickers::MegagroupSetId) {