Removed custom scope guard and replaced it with TGuardValue defined i…

…n the engine.
segross · Jun 28, 2020 · 5b737e1 · 5b737e1
1 parent c7d36a8
commit 5b737e1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 65 deletions.
diff --git a/Source/ImGui/Private/ImGuiContextManager.cpp b/Source/ImGui/Private/ImGuiContextManager.cpp
@@ -5,7 +5,6 @@
 #include "ImGuiDelegatesContainer.h"
 #include "ImGuiImplementation.h"
 #include "ImGuiModuleSettings.h"
-#include "Utilities/ScopeGuards.h"
 #include "Utilities/WorldContext.h"
 #include "Utilities/WorldContextIndex.h"
 

diff --git a/Source/ImGui/Private/Utilities/ScopeGuards.h b/Source/ImGui/Private/Utilities/ScopeGuards.h
diff --git a/Source/ImGui/Private/Widgets/SImGuiWidget.cpp b/Source/ImGui/Private/Widgets/SImGuiWidget.cpp
@@ -12,7 +12,6 @@
 #include "ImGuiModuleSettings.h"
 #include "TextureManager.h"
 #include "Utilities/Arrays.h"
-#include "Utilities/ScopeGuards.h"
 #include "VersionCompatibility.h"
 
 #include <Engine/Console.h>
@@ -647,10 +646,6 @@ int32 SImGuiWidget::OnPaint(const FPaintArgs& Args, const FGeometry& AllottedGeo
 		{
 #if ENGINE_COMPATIBILITY_LEGACY_CLIPPING_API
 			DrawList.CopyVertexData(VertexBuffer, ImGuiToScreen, VertexClippingRect);
-
-			// Get access to the Slate scissor rectangle defined in Slate Core API, so we can customize elements drawing.
-			extern SLATECORE_API TOptional<FShortRect> GSlateScissorRect;
-			auto GSlateScissorRectSaver = ScopeGuards::MakeStateSaver(GSlateScissorRect);
 #else
 			DrawList.CopyVertexData(VertexBuffer, ImGuiToScreen);
 #endif // ENGINE_COMPATIBILITY_LEGACY_CLIPPING_API
@@ -672,7 +667,9 @@ int32 SImGuiWidget::OnPaint(const FPaintArgs& Args, const FGeometry& AllottedGeo
 				const FSlateRect ClippingRect = DrawCommand.ClippingRect.IntersectionWith(MyClippingRect);
 
 #if ENGINE_COMPATIBILITY_LEGACY_CLIPPING_API
-				GSlateScissorRect = FShortRect{ ClippingRect };
+				// Get access to the Slate scissor rectangle defined in Slate Core API, so we can customize elements drawing.
+				extern SLATECORE_API TOptional<FShortRect> GSlateScissorRect;
+				TGuardValue<TOptional<FShortRect>> GSlateScissorRecGuard(GSlateScissorRect, FShortRect{ ClippingRect });
 #else
 				OutDrawElements.PushClip(FSlateClippingZone{ ClippingRect });
 #endif // ENGINE_COMPATIBILITY_LEGACY_CLIPPING_API