-
Notifications
You must be signed in to change notification settings - Fork 156
[Enhancement] QuickStart Menu #1351
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.
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
Open
Caladius
wants to merge
13
commits into
HarbourMasters:develop
Choose a base branch
from
Caladius:develop-quickstart
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
6922b40
Adds a new Quickstart Menu
Caladius 16ebe6b
remove duplicate Convert Function and replace red text with orange fo…
Caladius 60e0acf
New layout for the UI, presses back into a single view.
Caladius 0a6edbb
Update naming, last step is to implement F1 toggle
Caladius ce34ef9
Increase font scale for visibility.
Caladius 659647f
Adds File Erase buttons when no file slot is available, and finished …
Caladius 1d3a11c
Update to latest Dev
Caladius 717cff3
Feedback updates.
Caladius 5022b91
Update shuffle naming
Caladius 4557b97
Update to limit filename entry to 8 character
Caladius 5231509
clang
Caladius f6668a7
Update mm/2s2h/BenGui/QuickStart.cpp
Caladius e8d31bd
Update mm/2s2h/BenGui/QuickStart.cpp
Caladius File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,6 +27,7 @@ | |
| #include "Enhancements/Trackers/TimeSplits/TimesplitsSettings.h" | ||
| #include "BenMenu.h" | ||
| #include "BenMenuBar.h" | ||
| #include "QuickStart.h" | ||
| #include "DeveloperTools/HookDebugger.h" | ||
| #include "DeveloperTools/SaveEditor.h" | ||
| #include "DeveloperTools/ActorViewer.h" | ||
|
|
@@ -61,6 +62,7 @@ std::shared_ptr<DisplayOverlayWindow> mDisplayOverlayWindow; | |
| std::shared_ptr<TimesplitsWindow> mTimesplitsWindow; | ||
| std::shared_ptr<TimesplitsSettingsWindow> mTimesplitsSettingsWindow; | ||
| std::shared_ptr<BenModalWindow> mModalWindow; | ||
| std::shared_ptr<Ship::QuickStart> mQuickStartMenu; | ||
|
|
||
| UIWidgets::Colors GetMenuThemeColor() { | ||
| return mBenMenu->GetMenuThemeColor(); | ||
|
|
@@ -75,13 +77,12 @@ void SetupGuiElements() { | |
| style.Colors[ImGuiCol_MenuBarBg] = UIWidgets::ColorValues.at(UIWidgets::Colors::DarkGray); | ||
|
|
||
| mBenMenuBar = std::make_shared<BenMenuBar>(CVAR_MENU_BAR_OPEN, CVarGetInteger(CVAR_MENU_BAR_OPEN, 0)); | ||
| gui->SetMenuBar(std::reinterpret_pointer_cast<Ship::GuiMenuBar>(mBenMenuBar)); | ||
|
|
||
| if (!gui->GetMenuBar() && !CVarGetInteger("gSettings.DisableMenuShortcutNotify", 0)) { | ||
| #if defined(__SWITCH__) || defined(__WIIU__) | ||
| gui->GetGameOverlay()->TextDrawNotification(30.0f, true, "Press - to access enhancements menu"); | ||
| gui->GetGameOverlay()->TextDrawNotification(30.0f, true, "Press - to access the Quick Start menu"); | ||
| #else | ||
| gui->GetGameOverlay()->TextDrawNotification(30.0f, true, "Press F1 to access enhancements menu"); | ||
| gui->GetGameOverlay()->TextDrawNotification(30.0f, true, "Press F1 to access the Quick Start menu"); | ||
| #endif | ||
| } | ||
|
|
||
|
|
@@ -164,9 +165,8 @@ void SetupGuiElements() { | |
| "gWindows.CheckTrackerSettings", "Check Tracker Settings"); | ||
| gui->AddGuiWindow(mRandoCheckTrackerSettingsWindow); | ||
|
|
||
| mModalWindow = std::make_shared<BenModalWindow>("gWindows.ModalWindow", "Modal Window"); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Did you mean to completely remove the modal window? |
||
| gui->AddGuiWindow(mModalWindow); | ||
| mModalWindow->Show(); | ||
| mQuickStartMenu = std::make_shared<Ship::QuickStart>("gWindows.QuickStart", "QuickStart Menu"); | ||
| gui->AddGuiWindow(mQuickStartMenu); | ||
| } | ||
|
|
||
| void Destroy() { | ||
|
|
@@ -194,6 +194,7 @@ void Destroy() { | |
| mAudioEditorWindow = nullptr; | ||
| mItemTrackerWindow = nullptr; | ||
| mItemTrackerSettingsWindow = nullptr; | ||
| mQuickStartMenu = nullptr; | ||
| } | ||
|
|
||
| void RegisterPopup(std::string title, std::string message, std::string button1, std::string button2, | ||
|
|
||
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we're replacing the menu bar entirely, then we should scrub
mBenMenuBarhere.