[GEN][ZH] Refactor implemention for Shell recreation on Display Resolution change by xezon · Pull Request #1031 · TheSuperHackers/GeneralsGameCode

xezon · 2025-06-08T12:04:47Z

~~With this change the Options Menu no longer closes when the Display Resolution is changed.~~

This change refactors the way the Shell recreation is implemented. It now recreates the window stack with the previous state, instead of recreating it manually by pushing the "Menus/MainMenu.wnd".

The initial motivation here was to try make the Display Resolution change also work in-game, but that will require a lot more work on top of this. So this change only makes improvements towards changing the resolution in the Main Menu as per the original restrictions.

User facing nothing changes.

TODO

Replicate in Generals

Polypheides · 2025-06-08T17:48:54Z

I'll try to ask this question more clearly.

By default, pressing the ACCEPT button closes the options menu. Example video:

With this change, the ACCEPT button now keeps the options menu open. Example video:

Given this new behavior, would it make sense to rename the ACCEPT and CANCEL buttons to APPLY and CLOSE?

xezon · 2025-06-08T18:37:32Z

ACCEPT does not close the Options Menu.

Caball009 · 2025-06-09T19:32:04Z

I noticed this was also in the original code, but is there a way to reset TheShell instead of delete and new?

Shell has a reset function, does that do the equivalent? It seems like it does:

Reset the shell system to a clean state just as though init had just been called and ready to re-use

Tested that. It works.

I think this then also means we can move most of the code of shell::recreateShell into a new function in Shell.

I was wrong. When I tested I did not update generalszh.exe. The Shell::reset function does not do what we need and using it breaks the menus on resolution change. I think it was meant to be used for non resolution change reset.

I did a refactor anyway and moved some of the code into the Shell class. The new function will now reconstruct the Shell from within. I also improved the conditioning for the main menu button transition, to only trigger it if the Main Menu is actually in the Screen stack and not hidden (which is always the case in the Menu, but would be relevant if we wanted to recreate the UI in-game, where the Main Menu is hidden).

xezon · 2025-06-11T17:42:08Z

By default, pressing the ACCEPT button closes the options menu.

Right. I was totally confused here with what I was doing. This change was bogus.

I have now thrown out all the junk that changed the Options Menu ACCEPT button behaviour. It now functions the same way as it did originally. It now is a Refactor towards making the Resolution change work in-game in a future change.

This change should be correct now.

Skyaero42

I don't understand what this PR wants to be.

It fixes spelling errors in comments, removes tabs and add/removes blank lines in some locations, but not in others.
It adds the const keyword to some functions but not others.
It refactors the construction and deconstruction
It add new functionality through recreateWindowLayouts.

Skyaero42 · 2025-06-11T17:52:47Z

There are many other missing or multiple line breaks and random tabs. Why not fix those?

Right. I reverted all now unnecessary changes to this file.

xezon · 2025-06-15T10:59:22Z

It fixes spelling errors in comments, removes tabs and add/removes blank lines in some locations, but not in others.

These were remnants of earlier changes. I reverted this now.

It adds the const keyword to some functions but not others.

This is sort of required as part of this refactor.

void Shell::recreateWindowLayouts( void )
{
...
  const WindowLayout* layout = getScreenLayout(screenIndex);
  ScreenInfo& screenInfo = screenStackInfos[screenIndex];
  screenInfo.filename = layout->getFilename(); // this would fail to compile if the function was not const
  screenInfo.isHidden = layout->isHidden(); // this would fail to compile if the function was not const

It refactors the construction and deconstruction

This is required as part of this refactor. These are called in constructor + destructor, and also in recreateWindowLayouts.

It add new functionality through recreateWindowLayouts.

This is required as part of this refactor.

xezon · 2025-06-19T09:13:26Z

Rebased.

xezon · 2025-06-25T21:31:58Z

Needs review.

Skyaero42

Looks good to me

…eShell

…sitions

…sitions 2

…sitions 3

xezon · 2025-07-01T17:47:56Z

Rebased without conflicts.

Replicated in Generals with 1 mini conflict.

$ git diff 1ebce079804c879126b540baffccd6ae910ec106..08800291a3f426723d1020982d3bfda0d951ceca > changes.patch

$ git apply -p2 --directory=Generals --reject --whitespace=fix changes.patch
changes.patch:6: trailing whitespace.
        virtual void update( void );
Checking patch Generals/Code/GameEngine/Include/GameClient/Shell.h...
Checking patch Generals/Code/GameEngine/Include/GameClient/WindowLayout.h...
Checking patch Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp...
Hunk #1 succeeded at 724 (offset -37 lines).
Checking patch Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp...
Hunk #1 succeeded at 1241 (offset -60 lines).
Checking patch Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp...
Hunk #1 succeeded at 55 (offset -2 lines).
Hunk #2 succeeded at 93 (offset -2 lines).
Hunk #3 succeeded at 112 (offset -2 lines).
Hunk #4 succeeded at 144 (offset -2 lines).
Hunk #5 succeeded at 173 (offset -2 lines).
Hunk #6 succeeded at 225 (offset -2 lines).
Hunk #7 succeeded at 297 (offset -2 lines).
error: while searching for:
    Profile::StopRange("init");
#endif
        //else
                TheShell->push( AsciiString("Menus/MainMenu.wnd") );
  }
        m_isShellActive = TRUE;
}  // end showShell

error: patch failed: Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp:464
Applied patch Generals/Code/GameEngine/Include/GameClient/Shell.h cleanly.
Applied patch Generals/Code/GameEngine/Include/GameClient/WindowLayout.h cleanly.
Applied patch Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp cleanly.
Applied patch Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp cleanly.
Applying patch Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Hunk #7 applied cleanly.
Rejected hunk #8.

…ution change (TheSuperHackers#1031)

xezon added Bug Something is not working right, typically is user facing GUI For graphical user interface Minor Severity: Minor < Major < Critical < Blocker Gen Relates to Generals ZH Relates to Zero Hour labels Jun 8, 2025

xezon commented Jun 8, 2025

View reviewed changes

Comment thread GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowTransitions.h Outdated

Caball009 reviewed Jun 9, 2025

View reviewed changes

xezon force-pushed the xezon/fix-optionsmenu-close-on-resolution-change branch from 2b8b0bb to e9f2ede Compare June 10, 2025 18:07

xezon changed the title ~~[GEN][ZH] No longer close the Options Menu when changing Display Resolution~~ [GEN][ZH] Refactor implemention for Shell recreation on Display Resolution change Jun 11, 2025

xezon added Refactor Edits the code with insignificant behavior changes, is never user facing and removed Bug Something is not working right, typically is user facing labels Jun 11, 2025

Skyaero42 requested changes Jun 11, 2025

View reviewed changes

xezon requested a review from a team June 13, 2025 10:19

xezon requested a review from Skyaero42 June 15, 2025 10:59

xezon force-pushed the xezon/fix-optionsmenu-close-on-resolution-change branch from c527755 to 373a9f3 Compare June 19, 2025 09:13

xezon requested a review from Caball009 June 28, 2025 18:16

Skyaero42 approved these changes Jul 1, 2025

View reviewed changes

xezon added 7 commits July 1, 2025 19:35

[ZH] No longer close the Options Menu when changing Display Resolution

31babfb

Simplify GameWindowTransitionsHandler::setGroup function

50e7250

Reduce diff

058eea8

Move some of the code from ShellUtil into Shell and avoid deleting Th…

b6be21b

…eShell

Close the OptionsMenu on resolution change again

dc01d69

Delete the pref again

cfe98f2

Remove the ShellUtil files again

8a2a6ac

xezon added 4 commits July 1, 2025 19:35

Revert now unnecessary refactors in GameWindowManager, GameWindowTran…

5f1b0d0

…sitions

Revert now unnecessary refactors in GameWindowManager, GameWindowTran…

1bfe564

…sitions 2

Revert now unnecessary refactors in GameWindowManager, GameWindowTran…

0880029

…sitions 3

Replicate in Generals

00377f6

xezon force-pushed the xezon/fix-optionsmenu-close-on-resolution-change branch from 373a9f3 to 00377f6 Compare July 1, 2025 17:46

xezon merged commit 3bda27a into TheSuperHackers:main Jul 1, 2025
14 checks passed

xezon deleted the xezon/fix-optionsmenu-close-on-resolution-change branch July 1, 2025 18:20

fbraz3 pushed a commit to fbraz3/GeneralsX that referenced this pull request Nov 10, 2025

[GEN][ZH] Refactor implemention for Shell recreation on Display Resol…

9574e4c

…ution change (TheSuperHackers#1031)

fbraz3 pushed a commit to fbraz3/GeneralsX that referenced this pull request Feb 23, 2026

[GEN][ZH] Refactor implemention for Shell recreation on Display Resol…

7858c3c

…ution change (TheSuperHackers#1031)

Conversation

xezon commented Jun 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

TODO

Uh oh!

Polypheides commented Jun 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

xezon commented Jun 8, 2025

Uh oh!

Uh oh!

Caball009 Jun 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

xezon Jun 9, 2025

Choose a reason for hiding this comment

Uh oh!

xezon Jun 10, 2025

Choose a reason for hiding this comment

Uh oh!

xezon commented Jun 11, 2025

Uh oh!

Skyaero42 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Skyaero42 Jun 11, 2025

Choose a reason for hiding this comment

Uh oh!

xezon Jun 15, 2025

Choose a reason for hiding this comment

Uh oh!

xezon commented Jun 15, 2025

Uh oh!

xezon commented Jun 19, 2025

Uh oh!

xezon commented Jun 25, 2025

Uh oh!

Skyaero42 left a comment

Choose a reason for hiding this comment

Uh oh!

xezon commented Jul 1, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

xezon commented Jun 8, 2025 •

edited

Loading

Polypheides commented Jun 8, 2025 •

edited

Loading

Caball009 Jun 9, 2025 •

edited

Loading