From 23dc9ef494e579920cf86b051ff3e7a4304a79d0 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 23 Nov 2018 15:05:06 +0400 Subject: [PATCH] Destroy layers not delayed. --- Telegram/SourceFiles/mainwindow.cpp | 58 +++++++++---------- Telegram/SourceFiles/mainwindow.h | 6 +- Telegram/SourceFiles/messenger.cpp | 5 -- .../SourceFiles/ui/widgets/separate_panel.cpp | 12 ++-- .../SourceFiles/ui/widgets/separate_panel.h | 2 +- Telegram/SourceFiles/window/layer_widget.cpp | 26 ++++----- 6 files changed, 49 insertions(+), 60 deletions(-) diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp index c2336a1f2..332d3da0d 100644 --- a/Telegram/SourceFiles/mainwindow.cpp +++ b/Telegram/SourceFiles/mainwindow.cpp @@ -278,32 +278,43 @@ void MainWindow::showMainMenu() { } void MainWindow::ensureLayerCreated() { - if (!_layer) { - _layer.create(bodyWidget()); - _layer->hideFinishEvents( - ) | rpl::start_with_next([=, pointer = _layer.data()] { - layerHidden(pointer); - }, _layer->lifetime()); - if (controller()) { - controller()->enableGifPauseReason(Window::GifPauseReason::Layer); - } + if (_layer) { + return; + } + _layer = base::make_unique_q( + bodyWidget()); + + _layer->hideFinishEvents( + ) | rpl::start_with_next([=] { + destroyLayer(); + }, _layer->lifetime()); + + if (controller()) { + controller()->enableGifPauseReason(Window::GifPauseReason::Layer); } } -void MainWindow::destroyLayerDelayed() { - if (_layer) { - _layer.destroyDelayed(); - if (controller()) { - controller()->disableGifPauseReason(Window::GifPauseReason::Layer); - } +void MainWindow::destroyLayer() { + if (!_layer) { + return; } + const auto resetFocus = Ui::InFocusChain(_layer); + if (resetFocus) setFocus(); + _layer = nullptr; + if (controller()) { + controller()->disableGifPauseReason(Window::GifPauseReason::Layer); + } + if (resetFocus) setInnerFocus(); + InvokeQueued(this, [=] { + checkHistoryActivation(); + }); } void MainWindow::ui_hideSettingsAndLayer(anim::type animated) { if (_layer) { _layer->hideAll(animated); if (animated == anim::type::instant) { - destroyLayerDelayed(); + destroyLayer(); } } } @@ -331,7 +342,7 @@ void MainWindow::ui_showBox( if ((animated == anim::type::instant) && _layer && !_layer->layerShown()) { - destroyLayerDelayed(); + destroyLayer(); } } Messenger::Instance().hideMediaView(); @@ -618,19 +629,6 @@ void MainWindow::noIntro(Intro::Widget *was) { } } -void MainWindow::layerHidden(not_null layer) { - if (_layer != layer) { - return; - } - auto resetFocus = Ui::InFocusChain(layer); - if (resetFocus) setFocus(); - destroyLayerDelayed(); - if (resetFocus) setInnerFocus(); - InvokeQueued(this, [this] { - checkHistoryActivation(); - }); -} - bool MainWindow::takeThirdSectionFromLayer() { return _layer ? _layer->takeToThirdSection() : false; } diff --git a/Telegram/SourceFiles/mainwindow.h b/Telegram/SourceFiles/mainwindow.h index 0f76cce9a..9494d745e 100644 --- a/Telegram/SourceFiles/mainwindow.h +++ b/Telegram/SourceFiles/mainwindow.h @@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "platform/platform_specific.h" #include "platform/platform_main_window.h" #include "core/single_timer.h" +#include "base/unique_qptr.h" class MainWidget; class BoxContent; @@ -66,7 +67,6 @@ public: void activate(); void noIntro(Intro::Widget *was); - void layerHidden(not_null layer); bool takeThirdSectionFromLayer(); void checkHistoryActivation(); @@ -153,7 +153,7 @@ private: [[nodiscard]] bool skipTrayClick() const; void ensureLayerCreated(); - void destroyLayerDelayed(); + void destroyLayer(); void themeUpdated(const Window::Theme::BackgroundUpdate &data); @@ -167,7 +167,7 @@ private: object_ptr _passcodeLock = { nullptr }; object_ptr _intro = { nullptr }; object_ptr _main = { nullptr }; - object_ptr _layer = { nullptr }; + base::unique_qptr _layer; object_ptr _mediaPreview = { nullptr }; object_ptr _testingThemeWarning = { nullptr }; diff --git a/Telegram/SourceFiles/messenger.cpp b/Telegram/SourceFiles/messenger.cpp index 458f22f39..2f108cd92 100644 --- a/Telegram/SourceFiles/messenger.cpp +++ b/Telegram/SourceFiles/messenger.cpp @@ -196,7 +196,6 @@ void Messenger::showPhoto(not_null link) { } void Messenger::showPhoto(not_null photo, HistoryItem *item) { - if (_mediaView->isHidden()) Ui::hideLayer(anim::type::instant); _mediaView->showPhoto(photo, item); _mediaView->activateWindow(); _mediaView->setFocus(); @@ -205,7 +204,6 @@ void Messenger::showPhoto(not_null photo, HistoryItem *item) { void Messenger::showPhoto( not_null photo, not_null peer) { - if (_mediaView->isHidden()) Ui::hideLayer(anim::type::instant); _mediaView->showPhoto(photo, peer); _mediaView->activateWindow(); _mediaView->setFocus(); @@ -215,9 +213,6 @@ void Messenger::showDocument(not_null document, HistoryItem *item if (cUseExternalVideoPlayer() && document->isVideoFile()) { QDesktopServices::openUrl(QUrl("file:///" + document->location(false).fname)); } else { - if (_mediaView->isHidden()) { - Ui::hideLayer(anim::type::instant); - } _mediaView->showDocument(document, item); _mediaView->activateWindow(); _mediaView->setFocus(); diff --git a/Telegram/SourceFiles/ui/widgets/separate_panel.cpp b/Telegram/SourceFiles/ui/widgets/separate_panel.cpp index 89bb8ad2f..e416fa06c 100644 --- a/Telegram/SourceFiles/ui/widgets/separate_panel.cpp +++ b/Telegram/SourceFiles/ui/widgets/separate_panel.cpp @@ -277,7 +277,7 @@ void SeparatePanel::ensureLayerCreated() { if (_layer) { return; } - _layer.create(_body); + _layer = base::make_unique_q(_body); _layer->setHideByBackgroundClick(false); _layer->move(0, 0); _body->sizeValue( @@ -285,15 +285,11 @@ void SeparatePanel::ensureLayerCreated() { _layer->resize(size); }, _layer->lifetime()); _layer->hideFinishEvents( - ) | rpl::start_with_next([=, pointer = _layer.data()]{ - if (_layer != pointer) { - return; - } - auto saved = std::exchange(_layer, nullptr); - if (Ui::InFocusChain(saved)) { + ) | rpl::start_with_next([=]{ + if (Ui::InFocusChain(_layer)) { setFocus(); } - saved.destroyDelayed(); + _layer = nullptr; }, _layer->lifetime()); } diff --git a/Telegram/SourceFiles/ui/widgets/separate_panel.h b/Telegram/SourceFiles/ui/widgets/separate_panel.h index 77438d54b..c00145478 100644 --- a/Telegram/SourceFiles/ui/widgets/separate_panel.h +++ b/Telegram/SourceFiles/ui/widgets/separate_panel.h @@ -84,7 +84,7 @@ private: object_ptr> _back; object_ptr _body; base::unique_qptr _inner; - object_ptr _layer = { nullptr }; + base::unique_qptr _layer = { nullptr }; rpl::event_stream<> _synteticBackRequests; rpl::event_stream<> _userCloseRequests; rpl::event_stream<> _closeEvents; diff --git a/Telegram/SourceFiles/window/layer_widget.cpp b/Telegram/SourceFiles/window/layer_widget.cpp index 66fa140bf..06481ae98 100644 --- a/Telegram/SourceFiles/window/layer_widget.cpp +++ b/Telegram/SourceFiles/window/layer_widget.cpp @@ -208,7 +208,7 @@ void LayerStackWidget::BackgroundWidget::paintEvent(QPaintEvent *e) { _inPaintEvent = true; auto guard = gsl::finally([this] { _inPaintEvent = false; - checkIfDone(); + crl::on_main(this, [=] { checkIfDone(); }); }); if (!_bodyCache.isNull()) { @@ -400,10 +400,10 @@ void LayerStackWidget::hideLayers(anim::type animated) { } void LayerStackWidget::hideAll(anim::type animated) { - startAnimation([] {}, [=] { + startAnimation([] {}, [&] { clearLayers(); clearSpecialLayer(); - _mainMenu.destroyDelayed(); + _mainMenu.destroy(); }, Action::HideAll, animated); } @@ -635,12 +635,12 @@ void LayerStackWidget::animationDone() { layer->show(); hidden = false; } + setAttribute(Qt::WA_OpaquePaintEvent, false); if (hidden) { _hideFinishStream.fire({}); } else { showFinished(); } - setAttribute(Qt::WA_OpaquePaintEvent, false); } rpl::producer<> LayerStackWidget::hideFinishEvents() const { @@ -665,12 +665,12 @@ void LayerStackWidget::showFinished() { void LayerStackWidget::showSpecialLayer( object_ptr layer, anim::type animated) { - startAnimation([this, layer = std::move(layer)]() mutable { + startAnimation([&] { _specialLayer.destroy(); _specialLayer = std::move(layer); initChildLayer(_specialLayer); - }, [this] { - _mainMenu.destroyDelayed(); + }, [&] { + _mainMenu.destroy(); }, Action::ShowSpecialLayer, animated); } @@ -684,9 +684,9 @@ bool LayerStackWidget::showSectionInternal( } void LayerStackWidget::hideSpecialLayer(anim::type animated) { - startAnimation([] {}, [this] { + startAnimation([] {}, [&] { clearSpecialLayer(); - _mainMenu.destroyDelayed(); + _mainMenu.destroy(); }, Action::HideSpecialLayer, animated); } @@ -697,7 +697,7 @@ void LayerStackWidget::showMainMenu( _mainMenu.create(this, controller); _mainMenu->setGeometryToLeft(0, 0, _mainMenu->width(), height()); _mainMenu->setParent(this); - }, [this] { + }, [&] { clearLayers(); _specialLayer.destroy(); }, Action::ShowMainMenu, animated); @@ -729,8 +729,8 @@ LayerWidget *LayerStackWidget::pushBox( showFinished(); } } else { - startAnimation([] {}, [this] { - _mainMenu.destroyDelayed(); + startAnimation([] {}, [&] { + _mainMenu.destroy(); }, Action::ShowLayer, animated); } @@ -768,7 +768,7 @@ void LayerStackWidget::clearLayers() { void LayerStackWidget::clearSpecialLayer() { if (_specialLayer) { _specialLayer->setClosing(); - _specialLayer.destroyDelayed(); + _specialLayer.destroy(); } }