RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow non-colored and .tgs Lottie::Icon-s.

This commit is contained in:
John Preston 2022-01-05 15:09:21 +03:00
parent 43559fb6b7
commit 7b3cb0c3dd
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/boxes/sessions_box.cpp
View File

@ -289,10 +289,8 @@ void RenameBox(not_null<Ui::GenericBox*> box) {
Unexpected("Type in LottieForType."); Unexpected("Type in LottieForType.");
}(); }();
const auto size = st::sessionBigLottieSize; const auto size = st::sessionBigLottieSize;
static const auto kWhite = style::owned_color(Qt::white);
return std::make_unique<Lottie::Icon>(Lottie::IconDescriptor{ return std::make_unique<Lottie::Icon>(Lottie::IconDescriptor{
.path = u":/icons/settings/devices/"_q + path + u".lottie"_q, .path = u":/icons/settings/devices/"_q + path + u".lottie"_q,
.color = kWhite.color(),
.sizeOverride = QSize(size, size), .sizeOverride = QSize(size, size),
.frame = 1, .frame = 1,
}); });

4
Telegram/SourceFiles/ui/controls/call_mute_button.cpp
View File

@ -591,13 +591,13 @@ void CallMuteButton::refreshLabels() {
void CallMuteButton::refreshIcons() { void CallMuteButton::refreshIcons() {
_icons[0].emplace(Lottie::IconDescriptor{ _icons[0].emplace(Lottie::IconDescriptor{
.path = u":/icons/calls/voice.lottie"_q, .path = u":/icons/calls/voice.lottie"_q,
.color = st::groupCallIconFg, .color = &st::groupCallIconFg,
.sizeOverride = _st->lottieSize, .sizeOverride = _st->lottieSize,
.frame = (_iconState.index ? 0 : _iconState.frameTo), .frame = (_iconState.index ? 0 : _iconState.frameTo),
}); });
_icons[1].emplace(Lottie::IconDescriptor{ _icons[1].emplace(Lottie::IconDescriptor{
.path = u":/icons/calls/hands.lottie"_q, .path = u":/icons/calls/hands.lottie"_q,
.color = st::groupCallIconFg, .color = &st::groupCallIconFg,
.sizeOverride = _st->lottieSize, .sizeOverride = _st->lottieSize,
.frame = (_iconState.index ? _iconState.frameTo : 0), .frame = (_iconState.index ? _iconState.frameTo : 0),
}); });

2
Telegram/lib_lottie

@ -1 +1 @@
Subproject commit e1b707d128df046894753b99da44ac462ad52b96 Subproject commit 5b576ba9b90f621b3dd965d44caf8bd71c00f6ae