void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added support of Webm custom emoji to Premium Settings.

Browse source
This commit is contained in:
23rd 2022-08-31 19:38:30 +03:00 • committed by John Preston
parent e34b61d56b
commit 15aefddab4
1 changed files with 31 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
Telegram/SourceFiles/settings/settings_premium.cpp
View file

@ -21,11 +21,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/stickers/data_custom_emoji.h" // SerializeCustomEmojiId. #include "data/stickers/data_custom_emoji.h" // SerializeCustomEmojiId.
#include "data/stickers/data_stickers.h" #include "data/stickers/data_stickers.h"
#include "history/view/media/history_view_sticker.h" // EmojiSize. #include "history/view/media/history_view_sticker.h" // EmojiSize.
#include "history/view/media/history_view_sticker_player.h"
#include "info/info_wrap_widget.h" // Info::Wrap. #include "info/info_wrap_widget.h" // Info::Wrap.
#include "info/profile/info_profile_values.h" #include "info/profile/info_profile_values.h"
#include "info/settings/info_settings_widget.h" // SectionCustomTopBarData. #include "info/settings/info_settings_widget.h" // SectionCustomTopBarData.
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "lottie/lottie_single_player.h"
#include "main/main_account.h" #include "main/main_account.h"
#include "main/main_app_config.h" #include "main/main_app_config.h"
#include "main/main_session.h" #include "main/main_session.h"
@ -441,7 +441,7 @@ private:
QRectF _rect; QRectF _rect;
std::shared_ptr<Data::DocumentMedia> _media; std::shared_ptr<Data::DocumentMedia> _media;
std::unique_ptr<Lottie::SinglePlayer> _lottie; std::unique_ptr<HistoryView::StickerPlayer> _player;
bool _paused = false; bool _paused = false;
rpl::lifetime _lifetime; rpl::lifetime _lifetime;
@ -466,20 +466,22 @@ EmojiStatusTopBar::EmojiStatusTopBar(
} }
_lifetime.destroy(); _lifetime.destroy();
if (sticker->isLottie()) { if (sticker->isLottie()) {
_lottie = ChatHelpers::LottiePlayerFromDocument( _player = std::make_unique<HistoryView::LottiePlayer>(
ChatHelpers::LottiePlayerFromDocument(
_media.get(), _media.get(),
ChatHelpers::StickerLottieSize::EmojiInteractionReserved7, // ChatHelpers::StickerLottieSize::EmojiInteractionReserved7, //
size.toSize(), size.toSize(),
Lottie::Quality::High); Lottie::Quality::High));
} else if (sticker->isWebm()) {
_lifetime = _lottie->updates( _player = std::make_unique<HistoryView::WebmPlayer>(
) | rpl::start_with_next([=](Lottie::Update update) { _media->owner()->location(),
v::match(update.data, [&](const Lottie::Information &) { _media->bytes(),
callback(_rect.toRect()); size.toSize());
}, [&](const Lottie::DisplayFrameRequest &) { }
callback(_rect.toRect()); if (_player) {
}); _player->setRepaintCallback([=] { callback(_rect.toRect()); });
}); } else {
callback(_rect.toRect());
} }
}, _lifetime); }, _lifetime);
} }
@ -507,19 +509,22 @@ QPixmap EmojiStatusTopBar::paintedPixmap(const QSize &size) const {
} }
void EmojiStatusTopBar::paint(QPainter &p) { void EmojiStatusTopBar::paint(QPainter &p) {
if (_lottie) { if (_player) {
if (_lottie->ready()) { if (_player->ready()) {
const auto info = _lottie->frameInfo({ const auto frame = _player->frame(
.box = (_rect.size() * style::DevicePixelRatio()).toSize(), _rect.size().toSize(),
}); Qt::transparent,
false,
crl::now(),
_paused);
p.drawImage(_rect, info.image); p.drawImage(_rect, frame.image);
if (!_paused) { if (!_paused) {
_lottie->markFrameShown(); _player->markFrameShown();
} }
} }
} else if (_media) { } else if (_media) {
p.drawPixmap(_rect, paintedPixmap(_rect.size().toSize()), _rect); p.drawPixmap(_rect.topLeft(), paintedPixmap(_rect.size().toSize()));
} }
} }
@ -641,6 +646,10 @@ TopBarUser::TopBarUser(
updateTitle(document, name, controller); updateTitle(document, name, controller);
updateAbout(document); updateAbout(document);
auto event = QResizeEvent(size(), size());
resizeEvent(&event);
update();
}, lifetime()); }, lifetime());
rpl::combine( rpl::combine(
@ -909,9 +918,7 @@ TopBar::TopBar(
return false; return false;
}); });
rpl::single( rpl::single() | rpl::then(
rpl::empty_value()
) | rpl::then(
style::PaletteChanged() style::PaletteChanged()
) | rpl::start_with_next([=] { ) | rpl::start_with_next([=] {
const auto contrast = Ui::CountContrast( const auto contrast = Ui::CountContrast(