Cleaner separation of dependencies on DolphinWX.

project-slippi · Sep 22, 2021 · 0b7c7c1 · 0b7c7c1
1 parent 6411a13
commit 0b7c7c1
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 6 deletions.
diff --git a/Source/Core/Core/HW/EXI_DeviceSlippi.cpp b/Source/Core/Core/HW/EXI_DeviceSlippi.cpp
@@ -33,9 +33,8 @@
 //#include "Core/PatchEngine.h"
 #include "Core/PowerPC/PowerPC.h"
 
-// Not clean but idk a better way atm
-// #include "DolphinWX/Frame.h"
-// #include "DolphinWX/Main.h"
+// For LowerRenderWindow
+#include "UICommon/UICommon.h"
 
 #define FRAME_INTERVAL 900
 #define SLEEP_TIME_MS 8
@@ -2798,6 +2797,7 @@ void CEXISlippi::handleLogInRequest()
 	if (!logInRes)
 	{
 		// main_frame->LowerRenderWindow();
+		UICommon::LowerRenderWindow();
 		user->OpenLogInPage();
 		user->ListenForLogIn();
 	}

diff --git a/Source/Core/Core/Slippi/SlippiUser.cpp b/Source/Core/Core/Slippi/SlippiUser.cpp
@@ -15,8 +15,8 @@
 #include "Common/Common.h"
 #include "Core/ConfigManager.h"
 
-// #include "DolphinWX/Frame.h"
-// #include "DolphinWX/Main.h"
+// for RaiseRenderWindow
+#include "UICommon/UICommon.h"
 
 #ifdef __APPLE__
 #include "DolphinWX/SlippiAuthWebView/SlippiAuthWebView.h"
@@ -276,7 +276,7 @@ void SlippiUser::FileListenThread()
 		if (AttemptLogin())
 		{
 			runThread = false;
-			// main_frame->RaiseRenderWindow();
+			UICommon::RaiseRenderWindow();
 			break;
 		}
 

diff --git a/Source/Core/DolphinNoGUI/MainNoGUI.cpp b/Source/Core/DolphinNoGUI/MainNoGUI.cpp
@@ -54,6 +54,13 @@ namespace ProcessorInterface
 void PowerButton_Tap();
 }
 
+namespace UICommon
+{
+	// could do something with PlatformX11?
+	void RaiseRenderWindow() {}
+	void LowerRenderWindow() {}
+}
+
 class Platform
 {
 public:

diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp
@@ -32,6 +32,8 @@
 #include "Common/Logging/LogManager.h"
 #include "Common/Thread.h"
 
+#include "UICommon/UICommon.h"
+
 #include "Core/Analytics.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
@@ -92,6 +94,16 @@ std::string wxStringTranslator(const char *);
 
 CFrame *main_frame = nullptr;
 
+void UICommon::LowerRenderWindow()
+{
+	main_frame->LowerRenderWindow();
+}
+
+void UICommon::RaiseRenderWindow()
+{
+	main_frame->RaiseRenderWindow();
+}
+
 static std::mutex s_init_mutex;
 
 bool DolphinApp::Initialize(int &c, wxChar **v)

diff --git a/Source/Core/UICommon/UICommon.h b/Source/Core/UICommon/UICommon.h
@@ -13,4 +13,7 @@ void Shutdown();
 void CreateDirectories();
 void SetUserDirectory(const std::string& custom_path);
 
+void RaiseRenderWindow();
+void LowerRenderWindow();
+
 } // namespace UICommon