procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Use built-in zero-value dice animations.

This commit is contained in:
John Preston 2020-04-20 13:51:17 +04:00
parent bed208d621
commit abfd3ad1b9
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Telegram/SourceFiles/chat_helpers/stickers_dice_pack.cpp
View File

@ -35,11 +35,8 @@ DocumentData *DicePack::lookup(int value) {
if (!_requestId) { if (!_requestId) {
load(); load();
} }
tryGenerateLocalZero();
const auto i = _map.find(value); const auto i = _map.find(value);
//if (!value) {
// ensureZeroGenerated();
// return _zero;
//}
return (i != end(_map)) ? i->second.get() : nullptr; return (i != end(_map)) ? i->second.get() : nullptr;
} }
@ -88,16 +85,21 @@ void DicePack::applySet(const MTPDmessages_stickerSet &data) {
} }
} }
void DicePack::ensureZeroGenerated() { void DicePack::tryGenerateLocalZero() {
if (_zero) { if (!_map.empty()) {
return; return;
} }
static const auto kDiceString = QString::fromUtf8("\xF0\x9F\x8E\xB2"); static const auto kDiceString = QString::fromUtf8("\xF0\x9F\x8E\xB2");
static const auto kDartString = QString::fromUtf8("\xF0\x9F\x8E\xAF"); static const auto kDartString = QString::fromUtf8("\xF0\x9F\x8E\xAF");
const auto path = QString((_emoji == kDiceString) const auto path = (_emoji == kDiceString)
? ":/gui/art/dice_idle.tgs" ? qsl(":/gui/art/dice_idle.tgs")
: ":/gui/art/dart_idle.tgs"); : (_emoji == kDartString)
? qsl(":/gui/art/dart_idle.tgs")
: QString();
if (path.isEmpty()) {
return;
}
auto task = FileLoadTask( auto task = FileLoadTask(
path, path,
QByteArray(), QByteArray(),
@ -108,13 +110,15 @@ void DicePack::ensureZeroGenerated() {
task.process(); task.process();
const auto result = task.peekResult(); const auto result = task.peekResult();
Assert(result != nullptr); Assert(result != nullptr);
_zero = _session->data().processDocument( const auto document = _session->data().processDocument(
result->document, result->document,
std::move(result->thumb)); std::move(result->thumb));
_zero->setLocation(FileLocation(path)); document->setLocation(FileLocation(path));
Ensures(_zero->sticker()); _map.emplace(0, document);
Ensures(_zero->sticker()->animated);
Ensures(document->sticker());
Ensures(document->sticker()->animated);
} }
DicePacks::DicePacks(not_null<Main::Session*> session) : _session(session) { DicePacks::DicePacks(not_null<Main::Session*> session) : _session(session) {

3
Telegram/SourceFiles/chat_helpers/stickers_dice_pack.h
View File

@ -26,12 +26,11 @@ public:
private: private:
void load(); void load();
void applySet(const MTPDmessages_stickerSet &data); void applySet(const MTPDmessages_stickerSet &data);
void ensureZeroGenerated(); void tryGenerateLocalZero();
const not_null<Main::Session*> _session; const not_null<Main::Session*> _session;
QString _emoji; QString _emoji;
base::flat_map<int, not_null<DocumentData*>> _map; base::flat_map<int, not_null<DocumentData*>> _map;
DocumentData *_zero = nullptr;
mtpRequestId _requestId = 0; mtpRequestId _requestId = 0;
}; };