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

Fix GIF pause by layer. 

Let MainWindow enable / disable GIF pausing when a layer is shown.
This commit is contained in:
John Preston 2017-04-06 22:14:12 +03:00
parent 0d0307e175
commit 6b242a982b
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Telegram/SourceFiles/layerwidget.cpp
View File

@ -537,7 +537,6 @@ void LayerStackWidget::showBox(object_ptr<BoxContent> box) {
void LayerStackWidget::prepareForAnimation() {
if (isHidden()) {
show();
App::wnd()->enableGifPauseReason(Window::GifPauseReason::Layer);
}
if (_mainMenu) {
_mainMenu->hide();

29
Telegram/SourceFiles/mainwindow.cpp
View File

@ -376,9 +376,7 @@ void MainWindow::showSettings() {
void MainWindow::showSpecialLayer(object_ptr<LayerWidget> layer) {
if (_passcode) return;
if (!_layerBg) {
_layerBg.create(bodyWidget());
}
ensureLayerCreated();
_layerBg->showSpecialLayer(std::move(layer));
}
@ -387,17 +385,29 @@ void MainWindow::showMainMenu() {
if (isHidden()) showFromTray();
ensureLayerCreated();
_layerBg->showMainMenu();
}
void MainWindow::ensureLayerCreated() {
if (!_layerBg) {
_layerBg.create(bodyWidget());
enableGifPauseReason(Window::GifPauseReason::Layer);
}
}
void MainWindow::destroyLayerDelayed() {
if (_layerBg) {
_layerBg.destroyDelayed();
disableGifPauseReason(Window::GifPauseReason::Layer);
}
_layerBg->showMainMenu();
}
void MainWindow::ui_hideSettingsAndLayer(ShowLayerOptions options) {
if (_layerBg) {
_layerBg->hideAll();
if (options.testFlag(ForceFastShowLayer)) {
_layerBg.destroyDelayed();
destroyLayerDelayed();
}
}
}
@ -433,9 +443,7 @@ PasscodeWidget *MainWindow::passcodeWidget() {
void MainWindow::ui_showBox(object_ptr<BoxContent> box, ShowLayerOptions options) {
if (box) {
if (!_layerBg) {
_layerBg.create(bodyWidget());
}
ensureLayerCreated();
if (options.testFlag(KeepOtherLayers)) {
if (options.testFlag(ShowAfterOtherLayers)) {
_layerBg->prependBox(std::move(box));
@ -452,7 +460,7 @@ void MainWindow::ui_showBox(object_ptr<BoxContent> box, ShowLayerOptions options
if (_layerBg) {
_layerBg->hideTopLayer();
if (options.testFlag(ForceFastShowLayer) && !_layerBg->layerShown()) {
_layerBg.destroyDelayed();
destroyLayerDelayed();
}
}
hideMediaview();
@ -566,7 +574,7 @@ void MainWindow::checkHistoryActivation() {
}
void MainWindow::layerHidden() {
_layerBg.destroyDelayed();
destroyLayerDelayed();
hideMediaview();
setInnerFocus();
checkHistoryActivation();
@ -762,6 +770,7 @@ void MainWindow::noMain(MainWidget *was) {
void MainWindow::noLayerStack(LayerStackWidget *was) {
if (was == _layerBg) {
_layerBg = nullptr;
disableGifPauseReason(Window::GifPauseReason::Layer);
}
}

3
Telegram/SourceFiles/mainwindow.h
View File

@ -198,6 +198,9 @@ private:
void showConnecting(const QString &text, const QString &reconnect = QString());
void hideConnecting();
void ensureLayerCreated();
void destroyLayerDelayed();
void themeUpdated(const Window::Theme::BackgroundUpdate &data);
QPixmap grabInner();