Merge branch 'main' into 30.0.0-beta3

stream-labs · Nov 30, 2023 · a5ce6b3 · a5ce6b3
2 parents c62603f + 4eebf6c
commit a5ce6b3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/GrpcBrowser.cpp b/GrpcBrowser.cpp
@@ -1,6 +1,6 @@
 #include "GrpcBrowser.h"
 #include "SlBrowser.h"
-#include "Util.h"
+#include "WindowsFunctions.h"
 
 #include <filesystem>
 
@@ -37,7 +37,7 @@ class grpc_proxy_objImpl final : public grpc_proxy_obj::Service
 		if (!SlBrowser::instance().m_widget->isHidden())
 		{
 			HWND hwnd = HWND(SlBrowser::instance().m_widget->winId());
-			Util::ForceForegroundWindow(hwnd);
+			WindowsFunctions::ForceForegroundWindow(hwnd);
 		}								  	
 
 		return grpc::Status::OK;

diff --git a/JavascriptApi.h b/JavascriptApi.h
@@ -163,8 +163,8 @@ class JavascriptApi
 			//	Disable/Enable user input to the window
 			{"win_toggleUserInput", JS_TOGGLE_USER_INPUT},
 
-			// .(@function(arg1), @bool_enable)
-			//	Disable/Enable user input to the window
+			// .(@function(arg1))
+			//	Launches a new OBS and terminates existing one at same time.
 			{"win_restartOBS", JS_RESTART_OBS},
 
 			/***

diff --git a/browser-client.cpp b/browser-client.cpp
@@ -8,7 +8,7 @@
 #include "GrpcBrowser.h"
 #include "JavascriptApi.h"
 #include "SlBrowser.h"
-#include "Util.h"
+#include "WindowsFunctions.h"
 
 #include <json11/json11.hpp>
 
@@ -218,7 +218,7 @@ bool BrowserClient::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser, CefR
 			if (::IsIconic(hwnd))
 				::ShowWindow(hwnd, SW_RESTORE);
 
-			Util::ForceForegroundWindow(hwnd);
+			WindowsFunctions::ForceForegroundWindow(hwnd);
 			break;
 		}
 		case JavascriptApi::JS_QT_SET_WINDOW_POSITION: