chore: refactor main menu #2352
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
lodicolo
requested changes
Aug 2, 2024
| @@ -96,7 +96,7 @@ public partial class SettingsWindow : ImagePanel | |||
| private bool _returnToMenu; | |||
|
|
|||
| // Initialize. | |||
| public SettingsWindow(Base parent, MainMenu mainMenu, EscapeMenu escapeMenu) : base(parent, "SettingsWindow") | |||
| public SettingsWindow(Base parent, MainMenu? mainMenu, EscapeMenu? escapeMenu) : base(parent, "SettingsWindow") | |||
Comment on lines
65
to
90
| { | ||
| mMenuCanvas.RenderCanvas(); | ||
| } | ||
| public void Draw() => _menuCanvas.RenderCanvas(); | ||
|
|
||
| public void Reset() | ||
| { | ||
| mShouldReset = true; | ||
| } | ||
| public void Reset() => _shouldReset = true; | ||
|
|
||
| //Dispose | ||
| public void Dispose() | ||
| { | ||
| mMenuCanvas?.Dispose(); | ||
| } | ||
| public void Dispose() => _menuCanvas.Dispose(); | ||
|
|
||
| /// <inheritdoc /> | ||
| public List<Base> Children => MainMenu.Children; | ||
|
|
||
| /// <inheritdoc /> | ||
| public TElement Create<TElement>(params object[] parameters) where TElement : Base => | ||
| MainMenu.Create<TElement>(parameters); | ||
| public TElement Create<TElement>(params object[] parameters) where TElement : Base | ||
| { | ||
| return MainMenu.Create<TElement>(parameters); | ||
| } | ||
|
|
||
| /// <inheritdoc /> | ||
| public TElement Find<TElement>(string name = null, bool recurse = false) where TElement : Base => | ||
| MainMenu.Find<TElement>(name, recurse); | ||
| public TElement? Find<TElement>(string? name = null, bool recurse = false) where TElement : Base | ||
| { | ||
| return MainMenu.Find<TElement>(name, recurse); | ||
| } | ||
|
|
||
| /// <inheritdoc /> | ||
| public IEnumerable<TElement> FindAll<TElement>(bool recurse = false) where TElement : Base => | ||
| MainMenu.FindAll<TElement>(recurse); | ||
| public IEnumerable<TElement?> FindAll<TElement>(bool recurse = false) where TElement : Base | ||
| { | ||
| return MainMenu.FindAll<TElement>(recurse); | ||
| } | ||
|
|
||
| /// <inheritdoc /> | ||
| public void Remove<TElement>(TElement element, bool dispose = false) where TElement : Base => | ||
| public void Remove<TElement>(TElement element, bool dispose = false) where TElement : Base | ||
| { | ||
| MainMenu.Remove(element, dispose); | ||
|
|
||
| } |
WeylonSantana
force-pushed
the
refactor-main-menu
branch
from
539057e to
07658dd
Compare
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.
No description provided.