Fixed display of sticker panel on mode change in photo editor.

Telegram/SourceFiles/editor/controllers/stickers_panel_controller.cpp

@@ -44,19 +44,20 @@ rpl::producer<bool> StickersPanelController::panelShown() const {
 }
 
 void StickersPanelController::setShowRequestChanges(
-		rpl::producer<std::optional<bool>> &&showRequest) {
+		rpl::producer<ShowRequest> &&showRequest) {
 	std::move(
 		showRequest
-	) | rpl::start_with_next([=](std::optional<bool> show) {
+	) | rpl::start_with_next([=](ShowRequest show) {
-		if (!show) {
+		if (show == ShowRequest::ToggleAnimated) {
 			_stickersPanel->toggleAnimated();
 			_stickersPanel->raise();
-			return;
+		} else if (show == ShowRequest::ShowAnimated) {
-		}
-		if (*show) {
 			_stickersPanel->showAnimated();
-		} else {
+			_stickersPanel->raise();
-			_stickersPanel->toggleAnimated();
+		} else if (show == ShowRequest::HideAnimated) {
+			_stickersPanel->hideAnimated();
+		} else if (show == ShowRequest::HideFast) {
+			_stickersPanel->hideFast();
 		}
 	}, _stickersPanel->lifetime());
 }

Telegram/SourceFiles/editor/controllers/stickers_panel_controller.h

@@ -25,6 +25,13 @@ namespace Editor {
 
 class StickersPanelController final {
 public:
+	enum class ShowRequest {
+		ToggleAnimated,
+		ShowAnimated,
+		HideAnimated,
+		HideFast,
+	};
+
 	StickersPanelController(
 		not_null<Ui::RpWidget*> panelContainer,
 		not_null<Window::SessionController*> controller);
@@ -33,8 +40,7 @@ public:
 	-> rpl::producer<not_null<DocumentData*>>;
 	[[nodiscard]] rpl::producer<bool> panelShown() const;
 
-	void setShowRequestChanges(
+	void setShowRequestChanges(rpl::producer<ShowRequest> &&showRequest);
-		rpl::producer<std::optional<bool>> &&showRequest);
 	// Middle x and plain y position.
 	void setMoveRequestChanges(rpl::producer<QPoint> &&moveRequest);
 

Telegram/SourceFiles/editor/editor_paint.cpp

@@ -100,9 +100,11 @@ Paint::Paint(
 		})));
 
 	if (controllers->stickersPanelController) {
+		using ShowRequest = StickersPanelController::ShowRequest;
+
 		controllers->stickersPanelController->setShowRequestChanges(
 			controllers->stickersPanelController->stickerChosen(
-			) | rpl::map_to(std::optional<bool>(false)));
+			) | rpl::map_to(ShowRequest::HideAnimated));
 
 		controllers->stickersPanelController->stickerChosen(
 		) | rpl::start_with_next([=](not_null<DocumentData*> document) {

Telegram/SourceFiles/editor/photo_editor_controls.cpp

@@ -309,9 +309,15 @@ PhotoEditorControls::PhotoEditorControls(
 	}, lifetime());
 
 	if (_stickersButton) {
+		using ShowRequest = StickersPanelController::ShowRequest;
+
 		controllers->stickersPanelController->setShowRequestChanges(
-			_stickersButton->clicks(
+			rpl::merge(
-			) | rpl::map_to(std::optional<bool>(std::nullopt)));
+				_mode.value(
+				) | rpl::map_to(ShowRequest::HideFast),
+				_stickersButton->clicks(
+				) | rpl::map_to(ShowRequest::ToggleAnimated)
+			));
 
 		controllers->stickersPanelController->setMoveRequestChanges(
 			_paintBottomButtons->positionValue(