Tweaks and tidying up.

sheepytina · sheepytina · commit b8536128d4e6 · 2023-08-19T15:27:18.000+10:00
Disable integer scale slider if automatic sizing is overriding it.
Don't offer these UI options on Apple.
Removed unused code.
Updated LUS.
diff --git a/libultraship b/libultraship
@@ -1 +1 @@
-Subproject commit a62f289b37313730e547e8c291919c0069a927eb
+Subproject commit 5cb7309aa4bdae09bb30ca1fdf4fb6d5a5c7b00b
diff --git a/soh/soh/advancedResolutionEditor.cpp b/soh/soh/advancedResolutionEditor.cpp
@@ -27,6 +27,7 @@ void AdvancedResolutionSettingsWindow::InitElement() {
 }
 
 void AdvancedResolutionSettingsWindow::DrawElement() {
+#ifndef __APPLE__
     ImGui::SetNextWindowSize(ImVec2(360, 512), ImGuiCond_FirstUseEver);
     if (ImGui::Begin("Advanced Resolution Settings", &mIsVisible)) {
         bool update[sizeof(setting)];
@@ -119,14 +120,16 @@ void AdvancedResolutionSettingsWindow::DrawElement() {
         }
         
         if (default_maxIntegerScaleFactor < integerScale_maximumBounds) {
-            max_integerScaleFactor = integerScale_maximumBounds + 1; // allows people do things like cropped 5x scaling at 1080p
+            max_integerScaleFactor = integerScale_maximumBounds + 1; // the +1 allows people do things like cropped 5x scaling at 1080p
         } 
         // else max_integerScaleFactor = default_maxIntegerScaleFactor; // this statement is not needed if not using a static variable
         
         // Integer Scaling
         UIWidgets::EnhancementSliderInt("Integer scale factor: %d", "##ARSIntScale",
                                         "gAdvancedResolution_IntegerScaleFactor", 1, max_integerScaleFactor, "%d", 1,
-                                        true, !CVarGetInteger("gAdvancedResolution_PixelPerfectMode",0));
+                                        true,
+                                        !CVarGetInteger("gAdvancedResolution_PixelPerfectMode", 0) ||
+                                            CVarGetInteger("gAdvancedResolution_IntegerScale_FitAutomatically", 0));
         UIWidgets::Tooltip("Integer scales the image. Only available in pixel-perfect mode.");
 
         UIWidgets::PaddedEnhancementCheckbox("Automatically scale image to fit viewport.",
@@ -144,6 +147,7 @@ void AdvancedResolutionSettingsWindow::DrawElement() {
         if (update[UPDATE_verticalPixelCount])  { CVarSetInteger("gAdvancedResolution_verticalPixelCount",  (int32_t)verticalPixelCount); }
     }
     ImGui::End();
+#endif
 }
 
 void AdvancedResolutionSettingsWindow::UpdateElement() {
diff --git a/soh/soh/advancedResolutionEditor.h b/soh/soh/advancedResolutionEditor.h
@@ -4,12 +4,6 @@
 
 namespace AdvancedResolutionSettings {
 class AdvancedResolutionSettingsWindow : public LUS::GuiWindow {
-  private:
-    // Stored Values
-     float aspectRatio_X;
-     float aspectRatio_Y;
-     int verticalPixelCount;
-     bool verticalResolutionToggle;
   public:
     using LUS::GuiWindow::GuiWindow;
 

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ void AdvancedResolutionSettingsWindow::InitElement() {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`void AdvancedResolutionSettingsWindow::DrawElement() {`
	`30`	`+#ifndef __APPLE__`
`30`	`31`	`ImGui::SetNextWindowSize(ImVec2(360, 512), ImGuiCond_FirstUseEver);`
`31`	`32`	`if (ImGui::Begin("Advanced Resolution Settings", &mIsVisible)) {`
`32`	`33`	`bool update[sizeof(setting)];`
`@@ -119,14 +120,16 @@ void AdvancedResolutionSettingsWindow::DrawElement() {`
`119`	`120`	`}`
`120`	`121`
`121`	`122`	`if (default_maxIntegerScaleFactor < integerScale_maximumBounds) {`
`122`		`- max_integerScaleFactor = integerScale_maximumBounds + 1; // allows people do things like cropped 5x scaling at 1080p`
	`123`	`+ max_integerScaleFactor = integerScale_maximumBounds + 1; // the +1 allows people do things like cropped 5x scaling at 1080p`
`123`	`124`	`}`
`124`	`125`	`// else max_integerScaleFactor = default_maxIntegerScaleFactor; // this statement is not needed if not using a static variable`
`125`	`126`
`126`	`127`	`// Integer Scaling`
`127`	`128`	`UIWidgets::EnhancementSliderInt("Integer scale factor: %d", "##ARSIntScale",`
`128`	`129`	`"gAdvancedResolution_IntegerScaleFactor", 1, max_integerScaleFactor, "%d", 1,`
`129`		`- true, !CVarGetInteger("gAdvancedResolution_PixelPerfectMode",0));`
	`130`	`+ true,`
	`131`	`+ !CVarGetInteger("gAdvancedResolution_PixelPerfectMode", 0) \|\|`
	`132`	`+ CVarGetInteger("gAdvancedResolution_IntegerScale_FitAutomatically", 0));`
`130`	`133`	`UIWidgets::Tooltip("Integer scales the image. Only available in pixel-perfect mode.");`
`131`	`134`
`132`	`135`	`UIWidgets::PaddedEnhancementCheckbox("Automatically scale image to fit viewport.",`
`@@ -144,6 +147,7 @@ void AdvancedResolutionSettingsWindow::DrawElement() {`
`144`	`147`	`if (update[UPDATE_verticalPixelCount]) { CVarSetInteger("gAdvancedResolution_verticalPixelCount", (int32_t)verticalPixelCount); }`
`145`	`148`	`}`
`146`	`149`	`ImGui::End();`
	`150`	`+#endif`
`147`	`151`	`}`
`148`	`152`
`149`	`153`	`void AdvancedResolutionSettingsWindow::UpdateElement() {`