Skip to content

Conversation

@Mauller
Copy link

@Mauller Mauller commented May 13, 2025

Squash and merge

This PR removes the early return that was preventing the command bar size control from working during replays.

@Mauller Mauller changed the title [GEN][ZH] Allow command bar to be minimised during replays (#) [GEN][ZH] Allow command bar to be minimised during replays May 13, 2025
@Mauller Mauller self-assigned this May 13, 2025
@Mauller Mauller added Enhancement Is new feature or request Gen Relates to Generals ZH Relates to Zero Hour labels May 13, 2025
@xezon xezon added the Minor Severity: Minor < Major < Critical < Blocker label May 16, 2025
@xezon xezon added the Do Later Work on this later label May 24, 2025
Copy link

@helmutbuhler helmutbuhler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good and works as advertised

@xezon
Copy link

xezon commented Jun 2, 2025

I think this change is incomplete. GenTool puts NOP's in 5 locations. So for example the Command Bar cannot be toggled as Match Observer, which has 2 states: Native Match Observer and Player Observer after Surrender.

And also toggle has 2 ways: F9, and Button in Control Bar.

@Skyaero42
Copy link

I think this change is incomplete. GenTool puts NOP's in 5 locations. So for example the Command Bar cannot be toggled as Match Observer, which has 2 states: Native Match Observer and Player Observer after Surrender.

And also toggle has 2 ways: F9, and Button in Control Bar.

I've tested it and the toggle works for both type of observers.

F9 is not toggling the control bar, but hiding the entire UI, and thus a different functionality. For it to work, the if statement on line 3181 in CommandXlat.cpp needs to be removed.

I've pushed the F9 fix to @Mauller's commit. It should be all good to go now.

@Mauller Mauller changed the title [GEN][ZH] Allow command bar to be minimised during replays [GEN][ZH] Allow command bar to be minimised or hidden for match observers and during replays Jun 5, 2025
@xezon xezon added Enhancement Is new feature or request GUI For graphical user interface and removed Enhancement Is new feature or request Do Later Work on this later labels Jul 1, 2025
@xezon xezon changed the title [GEN][ZH] Allow command bar to be minimised or hidden for match observers and during replays [GEN][ZH] Enable Control Bar toggle for Replay playback and match observers Jul 1, 2025
Copy link

@xezon xezon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes look correct. Control bar is toggling.

There can be some additional cleanups done I think.

@xezon xezon added Major Severity: Minor < Major < Critical < Blocker and removed Minor Severity: Minor < Major < Critical < Blocker labels Jul 1, 2025
@xezon xezon added this to the Important features milestone Jul 12, 2025
@xezon xezon merged commit 8109614 into TheSuperHackers:main Jul 12, 2025
21 checks passed
@xezon xezon deleted the feature-minimise-cmdbar branch July 12, 2025 15:16
fbraz3 pushed a commit to fbraz3/GeneralsX that referenced this pull request Nov 10, 2025
…ervers (TheSuperHackers#854)

Co-authored-by: Bart Roossien <bart.roossien@energygo.nl>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Enhancement Is new feature or request Gen Relates to Generals GUI For graphical user interface Major Severity: Minor < Major < Critical < Blocker ZH Relates to Zero Hour

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Game Control Bar cannot be toggled in Replay Mode

5 participants