From 48756111a9f4738b70203066db1abdef67fd9b2a Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 15 Oct 2015 13:51:10 +0200 Subject: [PATCH] boxes animations pause mtp --- Telegram/SourceFiles/application.cpp | 11 ++++++++--- Telegram/SourceFiles/application.h | 3 ++- Telegram/SourceFiles/dialogswidget.cpp | 2 +- Telegram/SourceFiles/historywidget.cpp | 2 +- Telegram/SourceFiles/intro/intro.cpp | 4 ++-- Telegram/SourceFiles/layerwidget.cpp | 6 +++++- Telegram/SourceFiles/mainwidget.cpp | 2 +- Telegram/SourceFiles/overviewwidget.cpp | 2 +- Telegram/SourceFiles/passcodewidget.cpp | 2 +- Telegram/SourceFiles/profilewidget.cpp | 2 +- Telegram/SourceFiles/settingswidget.cpp | 2 +- 11 files changed, 24 insertions(+), 14 deletions(-) diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index db33f9226..54f0c178a 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -190,8 +190,8 @@ Application::Application(int &argc, char **argv) : PsApplication(argc, argv), connect(this, SIGNAL(updateReady()), this, SLOT(onUpdateReady())); #endif connect(this, SIGNAL(applicationStateChanged(Qt::ApplicationState)), this, SLOT(onAppStateChanged(Qt::ApplicationState))); - //connect(&writeUserConfigTimer, SIGNAL(timeout()), this, SLOT(onWriteUserConfig())); - //writeUserConfigTimer.setSingleShot(true); + + connect(&_mtpUnpauseTimer, SIGNAL(timeout()), this, SLOT(doMtpUnpause())); connect(&killDownloadSessionsTimer, SIGNAL(timeout()), this, SLOT(killDownloadSessions())); @@ -296,8 +296,13 @@ void Application::cancelPhotoUpdate(const PeerId &peer) { } } +void Application::mtpPause() { + MTP::pause(); + _mtpUnpauseTimer.start(1000); +} + void Application::mtpUnpause() { - QTimer::singleShot(1, this, SLOT(doMtpUnpause())); + _mtpUnpauseTimer.start(1); } void Application::doMtpUnpause() { diff --git a/Telegram/SourceFiles/application.h b/Telegram/SourceFiles/application.h index 5876e93b4..21866e49f 100644 --- a/Telegram/SourceFiles/application.h +++ b/Telegram/SourceFiles/application.h @@ -65,6 +65,7 @@ public: bool isPhotoUpdating(const PeerId &peer); void cancelPhotoUpdate(const PeerId &peer); + void mtpPause(); void mtpUnpause(); void selfPhotoCleared(const MTPUserProfilePhoto &result); @@ -165,7 +166,7 @@ private: UpdateDownloader *updateDownloader; #endif - QTimer writeUserConfigTimer; + SingleTimer _mtpUnpauseTimer; Translator *_translator; diff --git a/Telegram/SourceFiles/dialogswidget.cpp b/Telegram/SourceFiles/dialogswidget.cpp index 1c0c5435c..12c096521 100644 --- a/Telegram/SourceFiles/dialogswidget.cpp +++ b/Telegram/SourceFiles/dialogswidget.cpp @@ -1573,7 +1573,7 @@ void DialogsWidget::dialogsToUp() { } void DialogsWidget::animShow(const QPixmap &bgAnimCache) { - MTP::pause(); + if (App::app()) App::app()->mtpPause(); _bgAnimCache = bgAnimCache; _animCache = myGrab(this, rect()); diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index ef292da30..926ae34cf 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -3993,7 +3993,7 @@ HistoryItem *HistoryWidget::atTopImportantMsg(int32 &bottomUnderScrollTop) const } void HistoryWidget::animShow(const QPixmap &bgAnimCache, const QPixmap &bgAnimTopBarCache, bool back) { - MTP::pause(); + if (App::app()) App::app()->mtpPause(); _bgAnimCache = bgAnimCache; _bgAnimTopBarCache = bgAnimTopBarCache; diff --git a/Telegram/SourceFiles/intro/intro.cpp b/Telegram/SourceFiles/intro/intro.cpp index 9d6e187ad..e42c186cd 100644 --- a/Telegram/SourceFiles/intro/intro.cpp +++ b/Telegram/SourceFiles/intro/intro.cpp @@ -145,7 +145,7 @@ bool IntroWidget::createNext() { } void IntroWidget::prepareMove() { - MTP::pause(); + if (App::app()) App::app()->mtpPause(); if (cacheForHide.isNull() || cacheForHideInd != current) makeHideCache(); @@ -200,7 +200,7 @@ void IntroWidget::makeShowCache(int stage) { } void IntroWidget::animShow(const QPixmap &bgAnimCache, bool back) { - MTP::pause(); + if (App::app()) App::app()->mtpPause(); _bgAnimCache = bgAnimCache; diff --git a/Telegram/SourceFiles/layerwidget.cpp b/Telegram/SourceFiles/layerwidget.cpp index 2e4352567..aa72c1d3a 100644 --- a/Telegram/SourceFiles/layerwidget.cpp +++ b/Telegram/SourceFiles/layerwidget.cpp @@ -30,6 +30,7 @@ Copyright (c) 2014-2015 John Preston, https://desktop.telegram.org BackgroundWidget::BackgroundWidget(QWidget *parent, LayeredWidget *w) : QWidget(parent), w(w), aBackground(0), aBackgroundFunc(anim::easeOutCirc), hiding(false), shadow(st::boxShadow) { w->setParent(this); + if (App::app()) App::app()->mtpPause(); setGeometry(0, 0, App::wnd()->width(), App::wnd()->height()); aBackground.start(1); anim::start(this); @@ -62,7 +63,7 @@ void BackgroundWidget::paintEvent(QPaintEvent *e) { void BackgroundWidget::keyPressEvent(QKeyEvent *e) { if (e->key() == Qt::Key_Escape) { - startHide(); + onClose(); } } @@ -91,6 +92,8 @@ bool BackgroundWidget::onInnerClose() { void BackgroundWidget::startHide() { if (hiding) return; + if (App::app()) App::app()->mtpPause(); + hiding = true; if (App::wnd()) App::wnd()->setInnerFocus(); aBackground.start(0); @@ -146,6 +149,7 @@ bool BackgroundWidget::animStep(float64 ms) { } anim::stop(this); res = false; + if (App::app()) App::app()->mtpUnpause(); } else { aBackground.update(dt, aBackgroundFunc); } diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index 22536067b..e85ced8aa 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -2705,7 +2705,7 @@ void MainWidget::historyCleared(History *hist) { } void MainWidget::animShow(const QPixmap &bgAnimCache, bool back) { - MTP::pause(); + if (App::app()) App::app()->mtpPause(); _bgAnimCache = bgAnimCache; diff --git a/Telegram/SourceFiles/overviewwidget.cpp b/Telegram/SourceFiles/overviewwidget.cpp index 8b633ad8e..b8ac75041 100644 --- a/Telegram/SourceFiles/overviewwidget.cpp +++ b/Telegram/SourceFiles/overviewwidget.cpp @@ -2781,7 +2781,7 @@ void OverviewWidget::fastShow(bool back, int32 lastScrollTop) { } void OverviewWidget::animShow(const QPixmap &bgAnimCache, const QPixmap &bgAnimTopBarCache, bool back, int32 lastScrollTop) { - MTP::pause(); + if (App::app()) App::app()->mtpPause(); stopGif(); _bgAnimCache = bgAnimCache; diff --git a/Telegram/SourceFiles/passcodewidget.cpp b/Telegram/SourceFiles/passcodewidget.cpp index 4f75780ce..9faf75924 100644 --- a/Telegram/SourceFiles/passcodewidget.cpp +++ b/Telegram/SourceFiles/passcodewidget.cpp @@ -112,7 +112,7 @@ void PasscodeWidget::onChanged() { } void PasscodeWidget::animShow(const QPixmap &bgAnimCache, bool back) { - MTP::pause(); + if (App::app()) App::app()->mtpPause(); _bgAnimCache = bgAnimCache; diff --git a/Telegram/SourceFiles/profilewidget.cpp b/Telegram/SourceFiles/profilewidget.cpp index 201df5e07..e9222f477 100644 --- a/Telegram/SourceFiles/profilewidget.cpp +++ b/Telegram/SourceFiles/profilewidget.cpp @@ -1616,7 +1616,7 @@ int32 ProfileWidget::lastScrollTop() const { } void ProfileWidget::animShow(const QPixmap &bgAnimCache, const QPixmap &bgAnimTopBarCache, bool back, int32 lastScrollTop) { - MTP::pause(); + if (App::app()) App::app()->mtpPause(); stopGif(); _bgAnimCache = bgAnimCache; diff --git a/Telegram/SourceFiles/settingswidget.cpp b/Telegram/SourceFiles/settingswidget.cpp index 6cb2b3fa4..2ed47f512 100644 --- a/Telegram/SourceFiles/settingswidget.cpp +++ b/Telegram/SourceFiles/settingswidget.cpp @@ -1768,7 +1768,7 @@ void SettingsWidget::onParentResize(const QSize &newSize) { } void SettingsWidget::animShow(const QPixmap &bgAnimCache, bool back) { - MTP::pause(); + if (App::app()) App::app()->mtpPause(); _bgAnimCache = bgAnimCache;