Archive/Shipwright
0
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-04-28 13:17:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Various menu fixes (#5321)

Browse source 
* input viewer + rang + draw + circledisp

* clang
This commit is contained in:
Eric Hoey 2025-04-04 18:49:03 -04:00 • committed by GitHub
parent ee23d02921
commit a247c06be8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
soh/soh/Enhancements/controls/InputViewer.cpp
View file

@ -584,7 +584,7 @@ void InputViewerSettingsWindow::DrawElement() {
} }
// gInputViewer.Dpad // gInputViewer.Dpad
CVarCheckbox("Show D-Pad Layers", CVAR_INPUT_VIEWER("Dpad"), CVarCheckbox("Show D-Pad Layers", CVAR_INPUT_VIEWER("Dpad"),
CheckboxOptions().Color(THEME_COLOR).DefaultValue(true)); CheckboxOptions().Color(THEME_COLOR).DefaultValue(false));
if (useIndividualOutlines && CVarGetInteger(CVAR_INPUT_VIEWER("Dpad"), 0)) { if (useIndividualOutlines && CVarGetInteger(CVAR_INPUT_VIEWER("Dpad"), 0)) {
ImGui::Indent(); ImGui::Indent();
CVarCombobox("##DpadOutline", CVAR_INPUT_VIEWER("DpadOutlineMode"), buttonOutlineOptionsVerbose, CVarCombobox("##DpadOutline", CVAR_INPUT_VIEWER("DpadOutlineMode"), buttonOutlineOptionsVerbose,
@ -593,7 +593,7 @@ void InputViewerSettingsWindow::DrawElement() {
} }
// gInputViewer.Mod1 // gInputViewer.Mod1
CVarCheckbox("Show Modifier Button 1 Layers", CVAR_INPUT_VIEWER("Mod1"), CVarCheckbox("Show Modifier Button 1 Layers", CVAR_INPUT_VIEWER("Mod1"),
CheckboxOptions().Color(THEME_COLOR).DefaultValue(true)); CheckboxOptions().Color(THEME_COLOR).DefaultValue(false));
if (useIndividualOutlines && CVarGetInteger(CVAR_INPUT_VIEWER("Mod1"), 0)) { if (useIndividualOutlines && CVarGetInteger(CVAR_INPUT_VIEWER("Mod1"), 0)) {
ImGui::Indent(); ImGui::Indent();
CVarCombobox("##Mmod1Outline", CVAR_INPUT_VIEWER("Mod1OutlineMode"), buttonOutlineOptionsVerbose, CVarCombobox("##Mmod1Outline", CVAR_INPUT_VIEWER("Mod1OutlineMode"), buttonOutlineOptionsVerbose,
@ -602,7 +602,7 @@ void InputViewerSettingsWindow::DrawElement() {
} }
// gInputViewer.Mod2 // gInputViewer.Mod2
CVarCheckbox("Show Modifier Button 2 Layers", CVAR_INPUT_VIEWER("Mod2"), CVarCheckbox("Show Modifier Button 2 Layers", CVAR_INPUT_VIEWER("Mod2"),
CheckboxOptions().Color(THEME_COLOR).DefaultValue(true)); CheckboxOptions().Color(THEME_COLOR).DefaultValue(false));
if (useIndividualOutlines && CVarGetInteger(CVAR_INPUT_VIEWER("Mod2"), 0)) { if (useIndividualOutlines && CVarGetInteger(CVAR_INPUT_VIEWER("Mod2"), 0)) {
ImGui::Indent(); ImGui::Indent();
CVarCombobox("##Mod2Outline", CVAR_INPUT_VIEWER("Mod2OutlineMode"), buttonOutlineOptionsVerbose, CVarCombobox("##Mod2Outline", CVAR_INPUT_VIEWER("Mod2OutlineMode"), buttonOutlineOptionsVerbose,
@ -652,7 +652,7 @@ void InputViewerSettingsWindow::DrawElement() {
"Right Stick Visibility", CVAR_INPUT_VIEWER("RightStick.VisibilityMode"), stickModeOptions, "Right Stick Visibility", CVAR_INPUT_VIEWER("RightStick.VisibilityMode"), stickModeOptions,
ComboboxOptions() ComboboxOptions()
.Color(THEME_COLOR) .Color(THEME_COLOR)
.DefaultIndex(STICK_MODE_ALWAYS_SHOWN) .DefaultIndex(STICK_MODE_ALWAYS_HIDDEN)
.Tooltip( .Tooltip(
"Determines the conditions under which the moving layer of the right stick texture is visible.")); "Determines the conditions under which the moving layer of the right stick texture is visible."));
@ -661,7 +661,7 @@ void InputViewerSettingsWindow::DrawElement() {
"Right Stick Outline/Background Visibility", CVAR_INPUT_VIEWER("RightStick.OutlineMode"), stickModeOptions, "Right Stick Outline/Background Visibility", CVAR_INPUT_VIEWER("RightStick.OutlineMode"), stickModeOptions,
ComboboxOptions() ComboboxOptions()
.Color(THEME_COLOR) .Color(THEME_COLOR)
.DefaultIndex(STICK_MODE_ALWAYS_SHOWN) .DefaultIndex(STICK_MODE_ALWAYS_HIDDEN)
.Tooltip( .Tooltip(
"Determines the conditions under which the right stick outline/background texture is visible.")); "Determines the conditions under which the right stick outline/background texture is visible."));

3
soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
View file

@ -1839,7 +1839,8 @@ void ItemTrackerSettingsWindow::DrawElement() {
} }
if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.DungeonRewards"), SECTION_DISPLAY_MAIN_WINDOW) == if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.DungeonRewards"), SECTION_DISPLAY_MAIN_WINDOW) ==
SECTION_DISPLAY_SEPARATE) { SECTION_DISPLAY_SEPARATE) {
if (CVarCheckbox("Circle display", CVAR_TRACKER_ITEM("DungeonRewardsLayout"))) { if (CVarCheckbox("Circle display", CVAR_TRACKER_ITEM("DungeonRewardsLayout"),
CheckboxOptions().DefaultValue(false).Color(THEME_COLOR))) {
shouldUpdateVectors = true; shouldUpdateVectors = true;
} }
} }

7
soh/soh/SohGui/SohMenuEnhancements.cpp
View file

@ -562,7 +562,7 @@ void SohMenu::AddMenuEnhancements() {
AddWidget(path, "Kokiri Draw Distance", WIDGET_CVAR_CHECKBOX) AddWidget(path, "Kokiri Draw Distance", WIDGET_CVAR_CHECKBOX)
.CVar(CVAR_ENHANCEMENT("DisableKokiriDrawDistance")) .CVar(CVAR_ENHANCEMENT("DisableKokiriDrawDistance"))
.PreFunc( .PreFunc(
[](WidgetInfo& info) { info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("DisableDrawDistance"), 1) > 1; }) [](WidgetInfo& info) { info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("DisableDrawDistance"), 1) <= 1; })
.Options(CheckboxOptions().Tooltip( .Options(CheckboxOptions().Tooltip(
"The Kokiri are mystical beings that fade into view when approached. Enabling this will remove their " "The Kokiri are mystical beings that fade into view when approached. Enabling this will remove their "
"draw distance.")); "draw distance."));
@ -777,9 +777,8 @@ void SohMenu::AddMenuEnhancements() {
.Options(CheckboxOptions().Tooltip( .Options(CheckboxOptions().Tooltip(
"Change aiming for the Boomerang from Third-Person to First-Person to see past Link's head.")); "Change aiming for the Boomerang from Third-Person to First-Person to see past Link's head."));
AddWidget(path, "Aiming Reticle for Boomerang", WIDGET_CVAR_CHECKBOX) AddWidget(path, "Aiming Reticle for Boomerang", WIDGET_CVAR_CHECKBOX)
.CVar(CVAR_ENHANCEMENT("BoomerangFirstPerson")) .CVar(CVAR_ENHANCEMENT("BoomerangReticle"))
.PreFunc( .PreFunc([](WidgetInfo& info) { info.isHidden = !CVarGetInteger(CVAR_ENHANCEMENT("BoomerangFirstPerson"), 0); })
[](WidgetInfo& info) { info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("BoomerangFirstPerson"), 0) != 0; })
.Options(CheckboxOptions().Tooltip("Aiming with the Boomerang will display a reticle as with the Hookshot.")); .Options(CheckboxOptions().Tooltip("Aiming with the Boomerang will display a reticle as with the Hookshot."));
AddWidget(path, "Magic Spells", WIDGET_SEPARATOR_TEXT); AddWidget(path, "Magic Spells", WIDGET_SEPARATOR_TEXT);