Show system cursor inside window bounds when out of focus - works 50% of the time, every time

MaximDude · MaximDude · commit dfb2d3a37b8f · 2023-07-04T00:11:08.000+03:00
diff --git a/Managers/WindowMan.cpp b/Managers/WindowMan.cpp
@@ -522,13 +522,19 @@ namespace RTE {
 		} else {
 			SDL_RaiseWindow(m_PrimaryWindow.get());
 		}
+
+		SDL_ShowCursor(SDL_DISABLE);
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	void WindowMan::DisplaySwitchOut() const {
 		g_UInputMan.DisableMouseMoving(true);
 		g_UInputMan.DisableKeys(true);
+
+		SDL_ShowCursor(SDL_ENABLE);
+		// Sometimes the cursor will not be visible after disabling relative mode. Setting it to nullptr forces it to redraw, though this doesn't always work either.
+		SDL_SetCursor(nullptr);
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

Original file line number	Diff line number	Diff line change
`@@ -522,13 +522,19 @@ namespace RTE {`
`522`	`522`	`} else {`
`523`	`523`	`SDL_RaiseWindow(m_PrimaryWindow.get());`
`524`	`524`	`}`
	`525`	`+`
	`526`	`+ SDL_ShowCursor(SDL_DISABLE);`
`525`	`527`	`}`
`526`	`528`
`527`	`529`	`/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////`
`528`	`530`
`529`	`531`	`void WindowMan::DisplaySwitchOut() const {`
`530`	`532`	`g_UInputMan.DisableMouseMoving(true);`
`531`	`533`	`g_UInputMan.DisableKeys(true);`
	`534`	`+`
	`535`	`+ SDL_ShowCursor(SDL_ENABLE);`
	`536`	`+ // Sometimes the cursor will not be visible after disabling relative mode. Setting it to nullptr forces it to redraw, though this doesn't always work either.`
	`537`	`+ SDL_SetCursor(nullptr);`
`532`	`538`	`}`
`533`	`539`
`534`	`540`	`/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////`