muskit/spice2x.github.io
0
0
Fork 0
mirror of https://github.com/spice2x/spice2x.github.io.git synced 2026-10-06 10:08:13 -07:00
Code Issues Packages Projects Releases Wiki Activity

gitadora: more windowed mode fixes (#819)

Browse Source 
## Link to GitHub Issue or related Pull Request, if one exists
User reported

## Description of change

Sometimes the game moved the main window after `CreateWindowExA`
returned but before D3D initialization called
`graphics_capture_initial_window`. During this gap,
`GRAPHICS_HOOKED_WINDOW` was not set, so the placement hooks could not
identify the main window and preserve its monitor override. GITADORA
main, LEFT, and RIGHT windows are now registered immediately after
creation so later placement calls cannot undo their overrides.

This also adds `-gdwsmallsize` and `-gdwsmallpos` for explicitly setting
the SMALL window size and position. Explicit values override the
corresponding monitor-derived geometry, allowing the SMALL window's
10:16 aspect ratio to be preserved instead of stretching it to fill a
monitor.

## Testing
This commit is contained in:
bicarus
2026-07-21 00:54:09 -07:00
committed by GitHub
parent ed7318c270
commit 3f0921d983
6 changed files with 92 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/spice2x/hooks/graphics/graphics.cpp
+10 -5
View File
@@ -189,11 +189,13 @@ static bool gitadora_should_block_game_window_placement(HWND hWnd) {
}
const auto window_name = gitadora_window_name_for_hwnd(hWnd);
return window_name != nullptr && graphics_gitadora_has_window_monitor(window_name);
return window_name != nullptr && graphics_gitadora_has_window_override(window_name);
}
static void gitadora_remember_window(HWND hWnd, const std::string &window_name) {
if (window_name == "LEFT") {
if (window_name == "GITADORA") {
GRAPHICS_HOOKED_WINDOW = hWnd;
} else if (window_name == "LEFT") {
GFDM_LEFT_WINDOW = hWnd;
} else if (window_name == "RIGHT") {
GFDM_RIGHT_WINDOW = hWnd;
@@ -590,6 +592,12 @@ static HWND WINAPI CreateWindowExA_hook(DWORD dwExStyle, LPCSTR lpClassName, LPC
hWndParent, hMenu, hInstance, lpParam);
GRAPHICS_WINDOWS.push_back(result);
// remember these windows now because full capture happens later during D3D
// initialization; placement calls before then can undo creation-time overrides
if (result != nullptr && is_gfdm_window && !is_gfdm_sub_window) {
gitadora_remember_window(result, gfdm_window_name);
}
// theme the native title bar (dark/light)
set_window_dark_titlebar(result);
@@ -610,9 +618,6 @@ static HWND WINAPI CreateWindowExA_hook(DWORD dwExStyle, LPCSTR lpClassName, LPC
}
// only hook touch window if multiple windows are allowed
if (gfdm_window_name == "LEFT" || gfdm_window_name == "RIGHT") {
gitadora_remember_window(result, gfdm_window_name);
}
if (is_gfdm_sub_window && GRAPHICS_WINDOWED && !GRAPHICS_PREVENT_SECONDARY_WINDOWS) {
gitadora_remember_window(result, gfdm_window_name);
graphics_hook_subscreen_window(GFDM_SUBSCREEN_WINDOW);