Destroy layers not delayed.

Telegram/SourceFiles/mainwindow.cpp

@@ -278,32 +278,43 @@ void MainWindow::showMainMenu() {
 }
 
 void MainWindow::ensureLayerCreated() {
-	if (!_layer) {
+	if (_layer) {
-		_layer.create(bodyWidget());
+		return;
-		_layer->hideFinishEvents(
+	}
-		) | rpl::start_with_next([=, pointer = _layer.data()] {
+	_layer = base::make_unique_q<Window::LayerStackWidget>(
-			layerHidden(pointer);
+		bodyWidget());
-		}, _layer->lifetime());
+
-		if (controller()) {
+	_layer->hideFinishEvents(
-			controller()->enableGifPauseReason(Window::GifPauseReason::Layer);
+	) | rpl::start_with_next([=] {
-		}
+		destroyLayer();
+	}, _layer->lifetime());
+
+	if (controller()) {
+		controller()->enableGifPauseReason(Window::GifPauseReason::Layer);
 	}
 }
 
-void MainWindow::destroyLayerDelayed() {
+void MainWindow::destroyLayer() {
-	if (_layer) {
+	if (!_layer) {
-		_layer.destroyDelayed();
+		return;
-		if (controller()) {
-			controller()->disableGifPauseReason(Window::GifPauseReason::Layer);
-		}
 	}
+	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<Window::LayerStackWidget*> 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;
 }

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<Window::LayerStackWidget*> 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<Window::PasscodeLockWidget> _passcodeLock = { nullptr };
 	object_ptr<Intro::Widget> _intro = { nullptr };
 	object_ptr<MainWidget> _main = { nullptr };
-	object_ptr<Window::LayerStackWidget> _layer = { nullptr };
+	base::unique_qptr<Window::LayerStackWidget> _layer;
 	object_ptr<MediaPreviewWidget> _mediaPreview = { nullptr };
 
 	object_ptr<Window::Theme::WarningWidget> _testingThemeWarning = { nullptr };

Telegram/SourceFiles/messenger.cpp

@@ -196,7 +196,6 @@ void Messenger::showPhoto(not_null<const PhotoOpenClickHandler*> link) {
 }
 
 void Messenger::showPhoto(not_null<PhotoData*> 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<PhotoData*> photo, HistoryItem *item) {
 void Messenger::showPhoto(
 		not_null<PhotoData*> photo,
 		not_null<PeerData*> 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<DocumentData*> 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();

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<Window::LayerStackWidget>(_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()]{
+	) | rpl::start_with_next([=]{
-		if (_layer != pointer) {
+		if (Ui::InFocusChain(_layer)) {
-			return;
-		}
-		auto saved = std::exchange(_layer, nullptr);
-		if (Ui::InFocusChain(saved)) {
 			setFocus();
 		}
-		saved.destroyDelayed();
+		_layer = nullptr;
 	}, _layer->lifetime());
 }
 

Telegram/SourceFiles/ui/widgets/separate_panel.h

@@ -84,7 +84,7 @@ private:
 	object_ptr<Ui::FadeWrapScaled<Ui::IconButton>> _back;
 	object_ptr<Ui::RpWidget> _body;
 	base::unique_qptr<Ui::RpWidget> _inner;
-	object_ptr<Window::LayerStackWidget> _layer = { nullptr };
+	base::unique_qptr<Window::LayerStackWidget> _layer = { nullptr };
 	rpl::event_stream<> _synteticBackRequests;
 	rpl::event_stream<> _userCloseRequests;
 	rpl::event_stream<> _closeEvents;

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<LayerWidget> 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] {
+		startAnimation([] {}, [&] {
-			_mainMenu.destroyDelayed();
+			_mainMenu.destroy();
 		}, Action::ShowLayer, animated);
 	}
 
@@ -768,7 +768,7 @@ void LayerStackWidget::clearLayers() {
 void LayerStackWidget::clearSpecialLayer() {
 	if (_specialLayer) {
 		_specialLayer->setClosing();
-		_specialLayer.destroyDelayed();
+		_specialLayer.destroy();
 	}
 }