Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Added a blocking layer to prevent interaction with the game while in the exit menu #2574

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fix: Added a blocking layer to prevent interaction with the game while in the exit menu #2574

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
458f719
add blocking layer exit menu
DevGeniusCode Dec 31, 2024
c5594e1
add yaml
DevGeniusCode Dec 31, 2024
d9f899d
reformating lines & minor fix
DevGeniusCode Dec 31, 2024
2869f41
Update Window transitions
DevGeniusCode Jan 12, 2025
3919260
Update blocking layer with 100% transparency
DevGeniusCode Jan 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions Patch104pZH/Design/Changes/v1.0/2574_add_blocking_layer_exit_menu.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
date: 2024-12-31

title: Added a blocking layer to prevent interaction with the control bar while in the exit menu

changes:
- fix: Adds a blocking layer with 19.6% transparency to prevent interaction with the game while in the exit menu.
DevGeniusCode marked this conversation as resolved.
Show resolved Hide resolved
- tweak: Improves the interaction behavior of the exit menu by adding a transparent blocking layer.

labels:
- fix
- gui
- v1.0

links:
- https://github.com/TheSuperHackers/GeneralsGamePatch/pull/2574

authors:
- DevGeniusCode
29 changes: 27 additions & 2 deletions Patch104pZH/GameFilesEdited/Data/INI/WindowTransitions.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2258,10 +2258,16 @@ WindowTransition QuitNoSave

Window
WinName = QuitNoSave.wnd:QuitMenuParent
Style = FLASH
Style = WINFADE
FrameDelay = 0
END

Window
WinName = QuitNoSave.wnd:MenuBox
Style = FLASH
FrameDelay = 1
Copy link
Collaborator

Choose a reason for hiding this comment

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

What does this frame delay do? Before it was 0.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The delay defines the order in which the elements appear, and I defined that the menu will appear one delay after the blocking screen. You can see in the buttons that the delay increases from button to button, and thus the buttons appear one after the other and not all at once.
Now that we have made the blocking element completely transparent, we can return it to 0.

END

Window
WinName = QuitNoSave.wnd:ButtonOptions
Style = BUTTONFLASH
Expand Down Expand Up @@ -2292,9 +2298,16 @@ WindowTransition QuitNoSaveBack

Window
WinName = QuitNoSave.wnd:QuitMenuParent
Style = WINFADE
FrameDelay = 0
END

Window
WinName = QuitNoSave.wnd:MenuBox
Style = FLASH
FrameDelay = 0
END

Window
WinName = MainMenu.wnd:MapBorder2
Style = REVERSESOUND
Expand Down Expand Up @@ -2330,10 +2343,16 @@ WindowTransition QuitFull

Window
WinName = QuitMenu.wnd:QuitMenuParent
Style = FLASH
Style = WINFADE
FrameDelay = 0
END

Window
WinName = QuitMenu.wnd:MenuBox
Style = FLASH
FrameDelay = 1
DevGeniusCode marked this conversation as resolved.
Show resolved Hide resolved
END

Window
WinName = QuitMenu.wnd:ButtonSaveLoad
Style = BUTTONFLASH
Expand Down Expand Up @@ -2371,6 +2390,12 @@ WindowTransition QuitFullBack

Window
WinName = QuitMenu.wnd:QuitMenuParent
Style = WINFADE
FrameDelay = 0
END

Window
WinName = QuitMenu.wnd:MenuBox
Style = FLASH
FrameDelay = 0
END
Expand Down
Loading