feat(loading-screens): add 'loadscreen_cursor' option

Fixes \!25.
citizenfx · Apr 30, 2021 · 517c63e · 517c63e
1 parent 7ce0554
commit 517c63e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/code/components/loading-screens-five/src/LoadingScreens.cpp b/code/components/loading-screens-five/src/LoadingScreens.cpp
@@ -500,6 +500,17 @@ static InitFunction initFunction([] ()
 				{
 					autoShutdownNui = false;
 				}
+
+				static ConVar<bool> uiLoadingCursor("ui_loadingCursor", ConVar_None, false);
+				auto useCursor = mdComponent->GetEntries("loadscreen_cursor");
+				if (useCursor.begin() != useCursor.end())
+				{
+					uiLoadingCursor.GetHelper()->SetRawValue(true);
+				}
+				else
+				{
+					uiLoadingCursor.GetHelper()->SetRawValue(false);
+				}
 			}
 		});
 

diff --git a/code/components/nui-core/src/CefInput.cpp b/code/components/nui-core/src/CefInput.cpp
@@ -16,6 +16,7 @@
 #include <ReverseGameData.h>
 
 #include <windowsx.h>
+#include <console/Console.VariableHelpers.h>
 
 extern nui::GameInterface* g_nuiGi;
 
@@ -26,6 +27,8 @@ static bool g_hasOverriddenFocus = false;
 extern bool g_mainUIFlag;
 POINT g_cursorPos;
 
+static ConVar<bool> uiLoadingCursor("ui_loadingCursor", ConVar_None, false);
+
 bool isKeyDown(WPARAM wparam)
 {
 	return (GetKeyState(wparam) & 0x8000) != 0;
@@ -176,6 +179,11 @@ namespace nui
 		}
 
 		g_hasOverriddenFocus = hasFocus;
+
+		if (uiLoadingCursor.GetValue())
+		{
+			g_hasCursor = hasFocus;
+		}
 	}
 
 	void KeepInput(bool keepInput)