mirror of
https://github.com/telegramdesktop/tdesktop
synced 2024-12-14 02:14:44 +00:00
Don't add separate icon for faved pack.
Also update stickers search icons.
This commit is contained in:
parent
c6efb588dc
commit
d381836f01
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 |
BIN
Telegram/Resources/icons/stickers_search.png
Normal file
BIN
Telegram/Resources/icons/stickers_search.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 493 B |
BIN
Telegram/Resources/icons/stickers_search@2x.png
Normal file
BIN
Telegram/Resources/icons/stickers_search@2x.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 926 B |
@ -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);
|
||||
|
@ -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<StickerIcon> &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) {
|
||||
|
Loading…
Reference in New Issue
Block a user