Clean up and improve mainmenu theme / game theme code #13885
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This allows the game-specific topleft text to be shown e.g. in the "Select Mods" dialog.
grorp
added
Maintenance
srifqi
approved these changes
Oct 14, 2023
- Less code - menu_background.png provided by texture packs is applied again for the settings dialog
|
This PR is ready again. I replaced the "neutral" theme with a Sorry for not noticing this earlier. |
|
@srifqi Does your approval still apply? |
Yes, even though I liked the idea of a "neutral" theme, but it turns out that it is simpler to use the engine theme with a flag/variable/parameter for the decorations. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR reworks the code that sets the mainmenu theme aka game theme. It resolves the "Hide 'Minetest' header in dialog" to-do from #13476, the last remaining "Before 5.8.0" to-do in that issue.
Improvements:
In addition to the engine theme ("MINETEST" header) and to game-specific themes, a new "neutral" theme is introduced. This theme is used by the settings dialog to avoid the "MINETEST" header appearing behind the dialog.
The ContentDB dialog now always uses the engine theme. Previously, it would use the theme of the currently selected game if it was opened from the "Start Game" tab.
On touchscreen builds, the ContentDB dialog uses the neutral theme instead of the engine theme to avoid the "MINETEST" header appearing behind the dialog.
The update notification dialog now always uses the engine theme.
The game-specific "topleft text" on the "Start Game" tab (
core.set_topleft_text) no longer disappears when a dialog (e.g. "Select Mods") is opened. This is archieved by moving the responsibility for that text to the mainmenu theme as well.Cleaner code: Before this PR, the "Start Game" tab was responsible for setting the mainmenu theme for all other tabs. After this PR, all tabs and dialogs themselves are responsible for setting the mainmenu theme.
To do
This PR is a Ready for Review.
How to test
Click your way through the mainmenu and verify that all tabs and dialogs use the correct background, header, footer, music, etc.