From 387a2c5f3e74730047587173c9052f386ab5eb46 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Mon, 26 Apr 2021 10:52:28 -0700
Subject: [PATCH] UI: Add undo/redo actions for move up/down/top/bottom

Fixes obsproject/obs-studio#4567
---
 UI/data/locale/en-US.ini |  4 ++++
 UI/window-basic-main.cpp | 36 ++++++++++++++++++++++++------------
 UI/window-basic-main.hpp |  3 +++
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/UI/data/locale/en-US.ini b/UI/data/locale/en-US.ini
index a788de353..8b94e8f38 100644
--- a/UI/data/locale/en-US.ini
+++ b/UI/data/locale/en-US.ini
@@ -295,6 +295,10 @@ Undo.HideTransition="Hide Transition on '%1'"
 Undo.ShowSceneItem="Show '%1' in '%2'"
 Undo.HideSceneItem="Hide '%1' in '%2'"
 Undo.ReorderSources="Reorder sources in '%1'"
+Undo.MoveUp="Move '%1' up in '%2'"
+Undo.MoveDown="Move '%1' down in '%2'"
+Undo.MoveToTop="Move '%1' to top in '%2'"
+Undo.MoveToBottom="Move '%1' to bottom in '%2'"
 
 # transition name dialog
 TransitionNameDlg.Text="Please enter the name of the transition"
diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp
index 934dd2714..f08881d68 100644
--- a/UI/window-basic-main.cpp
+++ b/UI/window-basic-main.cpp
@@ -5656,40 +5656,52 @@ void OBSBasic::on_actionSourceProperties_triggered()
 		CreatePropertiesWindow(source);
 }
 
+void OBSBasic::MoveSceneItem(enum obs_order_movement movement,
+			     const QString &action_name)
+{
+	OBSSource scene_source = GetCurrentSceneSource();
+	OBSData undo_data = BackupScene(scene_source);
+
+	OBSSceneItem item = GetCurrentSceneItem();
+	obs_sceneitem_set_order(item, movement);
+
+	obs_source_t *source = obs_sceneitem_get_source(item);
+	const char *source_name = obs_source_get_name(source);
+	const char *scene_name = obs_source_get_name(scene_source);
+
+	OBSData redo_data = BackupScene(scene_source);
+	CreateSceneUndoRedoAction(action_name.arg(source_name, scene_name),
+				  undo_data, redo_data);
+}
+
 void OBSBasic::on_actionSourceUp_triggered()
 {
-	OBSSceneItem item = GetCurrentSceneItem();
-	obs_sceneitem_set_order(item, OBS_ORDER_MOVE_UP);
+	MoveSceneItem(OBS_ORDER_MOVE_UP, QTStr("Undo.MoveUp"));
 }
 
 void OBSBasic::on_actionSourceDown_triggered()
 {
-	OBSSceneItem item = GetCurrentSceneItem();
-	obs_sceneitem_set_order(item, OBS_ORDER_MOVE_DOWN);
+	MoveSceneItem(OBS_ORDER_MOVE_DOWN, QTStr("Undo.MoveDown"));
 }
 
 void OBSBasic::on_actionMoveUp_triggered()
 {
-	OBSSceneItem item = GetCurrentSceneItem();
-	obs_sceneitem_set_order(item, OBS_ORDER_MOVE_UP);
+	MoveSceneItem(OBS_ORDER_MOVE_UP, QTStr("Undo.MoveUp"));
 }
 
 void OBSBasic::on_actionMoveDown_triggered()
 {
-	OBSSceneItem item = GetCurrentSceneItem();
-	obs_sceneitem_set_order(item, OBS_ORDER_MOVE_DOWN);
+	MoveSceneItem(OBS_ORDER_MOVE_DOWN, QTStr("Undo.MoveDown"));
 }
 
 void OBSBasic::on_actionMoveToTop_triggered()
 {
-	OBSSceneItem item = GetCurrentSceneItem();
-	obs_sceneitem_set_order(item, OBS_ORDER_MOVE_TOP);
+	MoveSceneItem(OBS_ORDER_MOVE_TOP, QTStr("Undo.MoveToTop"));
 }
 
 void OBSBasic::on_actionMoveToBottom_triggered()
 {
-	OBSSceneItem item = GetCurrentSceneItem();
-	obs_sceneitem_set_order(item, OBS_ORDER_MOVE_BOTTOM);
+	MoveSceneItem(OBS_ORDER_MOVE_BOTTOM, QTStr("Undo.MoveToBottom"));
 }
 
 static BPtr<char> ReadLogFile(const char *subdir, const char *log)
diff --git a/UI/window-basic-main.hpp b/UI/window-basic-main.hpp
index d75f240ec..dcec5ea90 100644
--- a/UI/window-basic-main.hpp
+++ b/UI/window-basic-main.hpp
@@ -551,6 +551,9 @@ private:
 
 	QPointer<QObject> screenshotData;
 
+	void MoveSceneItem(enum obs_order_movement movement,
+			   const QString &action_name);
+
 public slots:
 	void DeferSaveBegin();
 	void DeferSaveEnd();