Moved performing of Undo/Redo from Editor::Paint to Editor::Scene.

Telegram/SourceFiles/editor/editor_paint.cpp

@@ -67,18 +67,10 @@ Paint::Paint(
 	// Undo / Redo.
 	controllers->undoController->performRequestChanges(
 	) | rpl::start_with_next([=](const Undo &command) {
-		const auto isUndo = (command == Undo::Undo);
+		if (command == Undo::Undo) {
-
+			_scene->performUndo();
-		const auto filtered = _scene->items(isUndo
+		} else {
-			? Qt::DescendingOrder
+			_scene->performRedo();
-			: Qt::AscendingOrder);
-
-		auto proj = [&](const ItemPtr &i) {
-			return isUndo ? i->isVisible() : isItemHidden(i);
-		};
-		const auto it = ranges::find_if(filtered, std::move(proj));
-		if (it != filtered.end()) {
-			(*it)->setVisible(!isUndo);
 		}
 
 		_hasUndo = _scene->hasUndo();

Telegram/SourceFiles/editor/scene/scene.cpp

@@ -171,6 +171,24 @@ bool Scene::hasRedo() const {
 	return ranges::any_of(_items, &NumberedItem::isUndidStatus);
 }
 
+void Scene::performUndo() {
+	const auto filtered = items(Qt::DescendingOrder);
+
+	const auto it = ranges::find_if(filtered, &NumberedItem::isNormalStatus);
+	if (it != filtered.end()) {
+		(*it)->setStatus(NumberedItem::Status::Undid);
+	}
+}
+
+void Scene::performRedo() {
+	const auto filtered = items(Qt::AscendingOrder);
+
+	const auto it = ranges::find_if(filtered, &NumberedItem::isUndidStatus);
+	if (it != filtered.end()) {
+		(*it)->setStatus(NumberedItem::Status::Normal);
+	}
+}
+
 Scene::~Scene() {
 	// Prevent destroying by scene of all items.
 	QGraphicsScene::removeItem(_canvas.get());

Telegram/SourceFiles/editor/scene/scene.h

@@ -52,6 +52,9 @@ public:
 
 	[[nodiscard]] bool hasUndo() const;
 	[[nodiscard]] bool hasRedo() const;
+
+	void performUndo();
+	void performRedo();
 protected:
 	void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
 	void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;