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

Apply themes in settings without preview.

This commit is contained in:
John Preston 2019-09-09 12:13:07 +03:00
parent aa10934e85
commit 6d29dc3b36
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Telegram/SourceFiles/data/data_cloud_themes.cpp
View File

@ -131,9 +131,7 @@ void CloudThemes::applyUpdate(const MTPTheme &theme) {
|| !cloud.documentId) { || !cloud.documentId) {
return; return;
} }
updateFromDocument( applyFromDocument(cloud);
cloud,
_session->data().document(cloud.documentId));
}, [&](const MTPDthemeDocumentNotModified &data) { }, [&](const MTPDthemeDocumentNotModified &data) {
}); });
scheduleReload(); scheduleReload();
@ -167,7 +165,7 @@ void CloudThemes::showPreview(const MTPTheme &data) {
void CloudThemes::showPreview(const CloudTheme &cloud) { void CloudThemes::showPreview(const CloudTheme &cloud) {
if (const auto documentId = cloud.documentId) { if (const auto documentId = cloud.documentId) {
previewFromDocument(cloud, _session->data().document(documentId)); previewFromDocument(cloud);
} else if (cloud.createdBy == _session->userId()) { } else if (cloud.createdBy == _session->userId()) {
Ui::show(Box( Ui::show(Box(
Window::Theme::CreateForExistingBox, Window::Theme::CreateForExistingBox,
@ -179,9 +177,8 @@ void CloudThemes::showPreview(const CloudTheme &cloud) {
} }
} }
void CloudThemes::updateFromDocument( void CloudThemes::applyFromDocument(const CloudTheme &cloud) {
const CloudTheme &cloud, const auto document = _session->data().document(cloud.documentId);
not_null<DocumentData*> document) {
loadDocumentAndInvoke(_updatingFrom, cloud, document, [=] { loadDocumentAndInvoke(_updatingFrom, cloud, document, [=] {
auto preview = Window::Theme::PreviewFromFile( auto preview = Window::Theme::PreviewFromFile(
document->data(), document->data(),
@ -194,9 +191,8 @@ void CloudThemes::updateFromDocument(
}); });
} }
void CloudThemes::previewFromDocument( void CloudThemes::previewFromDocument(const CloudTheme &cloud) {
const CloudTheme &cloud, const auto document = _session->data().document(cloud.documentId);
not_null<DocumentData*> document) {
loadDocumentAndInvoke(_previewFrom, cloud, document, [=] { loadDocumentAndInvoke(_previewFrom, cloud, document, [=] {
Core::App().showTheme(document, cloud); Core::App().showTheme(document, cloud);
}); });

8
Telegram/SourceFiles/data/data_cloud_themes.h
View File

@ -47,6 +47,7 @@ public:
void resolve(const QString &slug, const FullMsgId &clickFromMessageId); void resolve(const QString &slug, const FullMsgId &clickFromMessageId);
void showPreview(const MTPTheme &data); void showPreview(const MTPTheme &data);
void showPreview(const CloudTheme &cloud); void showPreview(const CloudTheme &cloud);
void applyFromDocument(const CloudTheme &cloud);
private: private:
struct LoadingDocument { struct LoadingDocument {
@ -64,12 +65,7 @@ private:
[[nodiscard]] bool needReload() const; [[nodiscard]] bool needReload() const;
void scheduleReload(); void scheduleReload();
void reloadCurrent(); void reloadCurrent();
void updateFromDocument( void previewFromDocument(const CloudTheme &cloud);
const CloudTheme &cloud,
not_null<DocumentData*> document);
void previewFromDocument(
const CloudTheme &cloud,
not_null<DocumentData*> document);
void loadDocumentAndInvoke( void loadDocumentAndInvoke(
LoadingDocument &value, LoadingDocument &value,
const CloudTheme &cloud, const CloudTheme &cloud,

5
Telegram/SourceFiles/window/themes/window_themes_cloud_list.cpp
View File

@ -489,10 +489,13 @@ void CloudList::insert(int index, const Data::CloudTheme &theme) {
|| i->waiting) { || i->waiting) {
return; return;
} }
const auto &cloud = i->theme;
if (button == Qt::RightButton) { if (button == Qt::RightButton) {
showMenu(*i); showMenu(*i);
} else if (cloud.documentId) {
_window->session().data().cloudThemes().applyFromDocument(cloud);
} else { } else {
_window->session().data().cloudThemes().showPreview(i->theme); _window->session().data().cloudThemes().showPreview(cloud);
} }
}); });
auto &element = *_elements.insert( auto &element = *_elements.insert(