Merge pull request #426 from Aragas/dev

v5.9.1
Aragas · Jul 18, 2023 · 8578942 · 8578942
2 parents 8464497 + 8548ff9
commit 8578942
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 26 deletions.
diff --git a/build/common.props b/build/common.props
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <GameVersion>1.0.0</GameVersion>
-    <Version>5.9.0</Version>
+    <Version>5.9.1</Version>
     <HarmonyVersion>2.2.2</HarmonyVersion>
     <ButterLibVersion>2.8.11</ButterLibVersion>
     <UIExtenderExVersion>2.8.0</UIExtenderExVersion>

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------------------------------
+Version: 5.9.1
+Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.2.0,v1.2.1
+* Scrolling regression fix
+---------------------------------------------------------------------------------------------------
 Version: 5.9.0
 Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.2.0,v1.2.1
 * Added the ability to save Settings Packs

diff --git a/src/MCM.Abstractions/Containers/ISettingsContainerHasSettingsPack.cs b/src/MCM.Abstractions/Containers/ISettingsContainerHasSettingsPack.cs
@@ -1,4 +1,4 @@
-using MCM.Abstractions.Base;
+using MCM.Abstractions.Base;
 
 using System.Collections.Generic;
 

diff --git a/src/MCM.UI/GUI/Prefabs/ModOptionsPageView.xml b/src/MCM.UI/GUI/Prefabs/ModOptionsPageView.xml
@@ -113,7 +113,7 @@
                     <!-- Separator -->
                     <BrushWidget WidthSizePolicy="StretchToParent" HeightSizePolicy="Fixed" SuggestedHeight="2"  VerticalAlignment="Top" Brush="MCM.Divider.Yellow" MarginLeft="15" MarginRight="15"/>
 
-                    <Widget WidthSizePolicy="StretchToParent" HeightSizePolicy="StretchToParent" MarginRight="30" MarginLeft="30">
+                    <Widget WidthSizePolicy="StretchToParent" HeightSizePolicy="StretchToParent" MarginRight="30" MarginLeft="30" IsVisible="@IsSettingVisible">
                       <Children>
 
                         <ScrollablePanel WidthSizePolicy="StretchToParent" HeightSizePolicy="StretchToParent" ClipRect="SettingsClipRect" MarginRight="20"
@@ -126,17 +126,7 @@
                                 <Widget Id="SettingsInnerPanel" WidthSizePolicy="StretchToParent" HeightSizePolicy="CoverChildren">
                                   <Children>
 
-                                    <Widget HeightSizePolicy="StretchToParent" WidthSizePolicy="StretchToParent" IsVisible="@IsSettingVisible">
-                                      <Children>
-                                        <SettingsView DataSource="{SelectedMod}" HeightSizePolicy="CoverChildren" WidthSizePolicy="StretchToParent" />
-                                      </Children>
-                                    </Widget>
-                                    <Widget HeightSizePolicy="StretchToParent" WidthSizePolicy="StretchToParent" IsVisible="@IsSettingUnavailableVisible">
-                                      <Children>
-                                        <TextWidget Text="@UnavailableText" HeightSizePolicy="CoverChildren" WidthSizePolicy="CoverChildren" HorizontalAlignment="Left" VerticalAlignment="Center"
-                                                    Brush="MCM.Item.Name" MarginLeft="10" DoNotAcceptEvents="true" ClipContents="true" />
-                                      </Children>
-                                    </Widget>
+                                    <SettingsView DataSource="{SelectedMod}" HeightSizePolicy="CoverChildren" WidthSizePolicy="StretchToParent" />
 
                                   </Children>
                                 </Widget>
@@ -153,6 +143,13 @@
                       </Children>
                     </Widget>
 
+                    <Widget HeightSizePolicy="StretchToParent" WidthSizePolicy="StretchToParent" MarginRight="30" MarginLeft="30" IsVisible="@IsSettingUnavailableVisible">
+                      <Children>
+                        <TextWidget Text="@UnavailableText" HeightSizePolicy="CoverChildren" WidthSizePolicy="CoverChildren" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                    Brush="MCM.Item.Name" MarginLeft="10" DoNotAcceptEvents="true" ClipContents="true" />
+                      </Children>
+                    </Widget>
+
                     <!-- Setting Hint Information Section -->
                     <ListPanel WidthSizePolicy="StretchToParent" HeightSizePolicy="Fixed" SuggestedHeight="100" VerticalAlignment="Bottom" LayoutImp.LayoutMethod="VerticalBottomToTop" MarginTop="1">
                       <Children>

diff --git a/src/MCM.UI/GUI/Prefabs/ModOptionsView.xml b/src/MCM.UI/GUI/Prefabs/ModOptionsView.xml
@@ -143,7 +143,7 @@
                     <!-- Separator -->
                     <BrushWidget WidthSizePolicy="StretchToParent" HeightSizePolicy="Fixed" SuggestedHeight="2"  VerticalAlignment="Top" Brush="MCM.Divider.Yellow" MarginLeft="15" MarginRight="15"/>
 
-                    <Widget WidthSizePolicy="StretchToParent" HeightSizePolicy="StretchToParent" MarginRight="30" MarginLeft="30">
+                    <Widget WidthSizePolicy="StretchToParent" HeightSizePolicy="StretchToParent" MarginRight="30" MarginLeft="30" IsVisible="@IsSettingVisible">
                       <Children>
 
                         <ScrollablePanel WidthSizePolicy="StretchToParent" HeightSizePolicy="StretchToParent" ClipRect="SettingsClipRect" MarginRight="20"
@@ -156,17 +156,7 @@
                                 <Widget Id="SettingsInnerPanel" WidthSizePolicy="StretchToParent" HeightSizePolicy="CoverChildren">
                                   <Children>
 
-                                    <Widget HeightSizePolicy="StretchToParent" WidthSizePolicy="StretchToParent" IsVisible="@IsSettingVisible">
-                                      <Children>
-                                        <SettingsView DataSource="{SelectedMod}" HeightSizePolicy="CoverChildren" WidthSizePolicy="StretchToParent" />
-                                      </Children>
-                                    </Widget>
-                                    <Widget HeightSizePolicy="StretchToParent" WidthSizePolicy="StretchToParent" IsVisible="@IsSettingUnavailableVisible">
-                                      <Children>
-                                        <TextWidget Text="@UnavailableText" HeightSizePolicy="CoverChildren" WidthSizePolicy="CoverChildren" HorizontalAlignment="Left" VerticalAlignment="Center"
-                                                    Brush="MCM.Item.Name" MarginLeft="10" DoNotAcceptEvents="true" ClipContents="true" />
-                                      </Children>
-                                    </Widget>
+                                    <SettingsView DataSource="{SelectedMod}" HeightSizePolicy="CoverChildren" WidthSizePolicy="StretchToParent" />
 
                                   </Children>
                                 </Widget>
@@ -183,6 +173,13 @@
                       </Children>
                     </Widget>
 
+                    <Widget HeightSizePolicy="StretchToParent" WidthSizePolicy="StretchToParent" MarginRight="30" MarginLeft="30" IsVisible="@IsSettingUnavailableVisible">
+                      <Children>
+                        <TextWidget Text="@UnavailableText" HeightSizePolicy="CoverChildren" WidthSizePolicy="CoverChildren" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                    Brush="MCM.Item.Name" MarginLeft="10" DoNotAcceptEvents="true" ClipContents="true" />
+                      </Children>
+                    </Widget>
+
                     <!-- Setting Hint Information Section -->
                     <ListPanel WidthSizePolicy="StretchToParent" HeightSizePolicy="Fixed" SuggestedHeight="100" VerticalAlignment="Bottom"
                                LayoutImp.LayoutMethod="VerticalBottomToTop" MarginTop="1">