Suggestions 2

HarbourMasters · Jun 17, 2024 · 1a09819 · 1a09819
1 parent dd06165
commit 1a09819
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/mm/2s2h/BenGui/BenMenuBar.cpp b/mm/2s2h/BenGui/BenMenuBar.cpp
@@ -174,8 +174,12 @@ void DrawSettingsMenu() {
         if (UIWidgets::BeginMenu("Graphics")) {
 
 #ifndef __APPLE__
-            // TODO: Will need to disable this slider when "Advanced Resolution" mode is active.
-            if (UIWidgets::CVarSliderFloat("Internal Resolution: %f %%", CVAR_INTERNAL_RESOLUTION, 0.5f, 2.0f, 1.0f)) {
+            const bool disabled_resolutionSlider =
+                (CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".VerticalResolutionToggle", 0) &&
+                 CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".Enabled", 0)) ||
+                CVarGetInteger("gLowResMode", 0);
+            if (UIWidgets::CVarSliderFloat("Internal Resolution: %f %%", CVAR_INTERNAL_RESOLUTION, 0.5f, 2.0f, 1.0f,
+                                           { .disabled = disabled_resolutionSlider })) {
                 Ship::Context::GetInstance()->GetWindow()->SetResolutionMultiplier(
                     CVarGetFloat(CVAR_INTERNAL_RESOLUTION, 1));
             };

diff --git a/mm/2s2h/Enhancements/ResolutionEditor/ResolutionEditor.cpp b/mm/2s2h/Enhancements/ResolutionEditor/ResolutionEditor.cpp
@@ -65,7 +65,7 @@ void AdvancedResolutionSettingsWindow::DrawElement() {
 
         // Initialise integer scale bounds.
         int max_integerScaleFactor = default_maxIntegerScaleFactor; // default value, which may or may not get
-                                                                      // overridden depending on viewport res
+                                                                    // overridden depending on viewport res
 
         int integerScale_maximumBounds = 1; // can change when window is resized
         // This is mostly just for UX purposes, as Fit Automatically logic is part of LUS.
@@ -117,8 +117,7 @@ void AdvancedResolutionSettingsWindow::DrawElement() {
                  CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".Enabled", 0)) ||
                 CVarGetInteger("gLowResMode", 0);
 #ifndef __APPLE__
-            // TODO and note for code review:
-            // - This is copied from BenMenuBar. I'm aware this needs to be replaced with a non-float slider.
+            // This is copied from BenMenuBar. I'm aware this needs to be replaced with a non-float slider.
             if (UIWidgets::CVarSliderFloat("Internal Resolution: %f %%", CVAR_INTERNAL_RESOLUTION, 0.5f, 2.0f, 1.0f,
                                            { .disabled = disabled_resolutionSlider })) {
                 Ship::Context::GetInstance()->GetWindow()->SetResolutionMultiplier(