From 5ae4cfeafc14e3e5166330d7fd094c03894f2f20 Mon Sep 17 00:00:00 2001
From: codereader <greebo@angua.at>
Date: Thu, 24 Dec 2020 13:04:16 +0100
Subject: [PATCH] #5451: LayerOrthoContextMenuItems now dispatch the operations
 through the command system

---
 .../ui/layers/LayerOrthoContextMenuItem.cpp   | 25 +++----------------
 radiant/ui/layers/LayerOrthoContextMenuItem.h |  3 ---
 2 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/radiant/ui/layers/LayerOrthoContextMenuItem.cpp b/radiant/ui/layers/LayerOrthoContextMenuItem.cpp
index e222ddf195..63e9f5c986 100644
--- a/radiant/ui/layers/LayerOrthoContextMenuItem.cpp
+++ b/radiant/ui/layers/LayerOrthoContextMenuItem.cpp
@@ -56,36 +56,17 @@ void LayerOrthoContextMenuItem::preShow()
 
 void LayerOrthoContextMenuItem::AddToLayer(int layerID)
 {
-	DoWithMapLayerManager([=](scene::ILayerManager& manager)
-	{
-		manager.addSelectionToLayer(layerID);
-	});
+    GlobalCommandSystem().executeCommand("AddSelectionToLayer", cmd::Argument(layerID));
 }
 
 void LayerOrthoContextMenuItem::MoveToLayer(int layerID)
 {
-	DoWithMapLayerManager([=](scene::ILayerManager& manager)
-	{
-		manager.moveSelectionToLayer(layerID);
-	});
+    GlobalCommandSystem().executeCommand("MoveSelectionToLayer", cmd::Argument(layerID));
 }
 
 void LayerOrthoContextMenuItem::RemoveFromLayer(int layerID)
 {
-	DoWithMapLayerManager([=](scene::ILayerManager& manager)
-	{
-		manager.removeSelectionFromLayer(layerID);
-	});
-}
-
-void LayerOrthoContextMenuItem::DoWithMapLayerManager(const std::function<void(scene::ILayerManager&)>& func)
-{
-	if (!GlobalMapModule().getRoot())
-	{
-		return;
-	}
-
-	func(GlobalMapModule().getRoot()->getLayerManager());
+    GlobalCommandSystem().executeCommand("RemoveSelectionFromLayer", cmd::Argument(layerID));
 }
 
 } // namespace
diff --git a/radiant/ui/layers/LayerOrthoContextMenuItem.h b/radiant/ui/layers/LayerOrthoContextMenuItem.h
index 9bd4a913d3..7195eabbe0 100644
--- a/radiant/ui/layers/LayerOrthoContextMenuItem.h
+++ b/radiant/ui/layers/LayerOrthoContextMenuItem.h
@@ -38,9 +38,6 @@ class LayerOrthoContextMenuItem :
 	static void AddToLayer(int layerID);
 	static void MoveToLayer(int layerID);
 	static void RemoveFromLayer(int layerID);
-
-private:
-	static void DoWithMapLayerManager(const std::function<void(scene::ILayerManager&)>& func);
 };
 typedef std::shared_ptr<LayerOrthoContextMenuItem> LayerOrthoContextMenuItemPtr;