Don't add separate icon for faved pack.

Also update stickers search icons.
This commit is contained in:
John Preston 2018-03-08 15:12:20 +03:00
parent c6efb588dc
commit d381836f01
6 changed files with 7 additions and 6 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 493 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 926 B

View File

@ -90,8 +90,7 @@ stickersRowDuration: 200;
stickersSettings: icon {{ "emoji_settings", emojiIconFg }}; stickersSettings: icon {{ "emoji_settings", emojiIconFg }};
stickersTrending: icon {{ "emoji_trending", emojiIconFg }}; stickersTrending: icon {{ "emoji_trending", emojiIconFg }};
stickersFaved: icon {{ "emoji_faved", emojiIconFg }}; stickersSearch: icon {{ "stickers_search", emojiIconFg, point(0px, 1px) }};
stickersSearch: icon {{ "title_search", emojiIconFg, point(0px, 5px) }};
stickersSettingsUnreadSize: 17px; stickersSettingsUnreadSize: 17px;
stickersSettingsUnreadPosition: point(4px, 5px); stickersSettingsUnreadPosition: point(4px, 5px);

View File

@ -619,8 +619,8 @@ void StickersListWidget::Footer::paintSetIcon(
auto getSpecialSetIcon = [](uint64 setId) { auto getSpecialSetIcon = [](uint64 setId) {
if (setId == Stickers::FeaturedSetId) { if (setId == Stickers::FeaturedSetId) {
return &st::stickersTrending; return &st::stickersTrending;
} else if (setId == Stickers::FavedSetId) { //} else if (setId == Stickers::FavedSetId) {
return &st::stickersFaved; // return &st::stickersFaved;
} }
return &st::emojiRecent; return &st::emojiRecent;
}; };
@ -1252,7 +1252,7 @@ void StickersListWidget::paintEmptySearchResults(Painter &p) {
p.setPen(st::windowSubTextFg); p.setPen(st::windowSubTextFg);
p.drawTextLeft( p.drawTextLeft(
(width() - textWidth) / 2, (width() - textWidth) / 2,
iconTop + st::stickersEmpty.height() + st::normalFont->height, iconTop + st::stickersEmpty.height() - st::normalFont->height,
width(), width(),
text, text,
textWidth); textWidth);
@ -1997,7 +1997,9 @@ void StickersListWidget::fillIcons(QList<StickerIcon> &icons) {
} }
if (i != _mySets.size() && _mySets[i].id == Stickers::RecentSetId) { if (i != _mySets.size() && _mySets[i].id == Stickers::RecentSetId) {
++i; ++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) { for (auto l = _mySets.size(); i != l; ++i) {
if (_mySets[i].id == Stickers::MegagroupSetId) { if (_mySets[i].id == Stickers::MegagroupSetId) {