Merge pull request #211 from stanriders/update-packages-20240731

Update packages
ppy · Aug 1, 2024 · bc9ab93 · bc9ab93
2 parents a1bb55f + f7ebe5a
commit bc9ab93
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/PerformanceCalculatorGUI/Components/ExtendedUserModSelectOverlay.cs b/PerformanceCalculatorGUI/Components/ExtendedUserModSelectOverlay.cs
@@ -9,8 +9,6 @@ namespace PerformanceCalculatorGUI.Components
 {
     public partial class ExtendedUserModSelectOverlay : UserModSelectOverlay
     {
-        protected override bool ShowModEffects => false;
-
         public ExtendedUserModSelectOverlay()
             : base(OverlayColourScheme.Blue)
         {
@@ -19,7 +17,8 @@ public ExtendedUserModSelectOverlay()
         protected override void PopIn()
         {
             Header.Hide();
-            MainAreaContent.Padding = new MarginPadding { Bottom = 64 };
+            MainAreaContent.Padding = new MarginPadding();
+            TopLevelContent.Children[0].Hide(); // hide the gray background of the ShearedOverlayContainer
 
             base.PopIn();
         }

diff --git a/PerformanceCalculatorGUI/Components/TextBoxes/ExtendedLabelledTextBox.cs b/PerformanceCalculatorGUI/Components/TextBoxes/ExtendedLabelledTextBox.cs
@@ -7,17 +7,10 @@ namespace PerformanceCalculatorGUI.Components.TextBoxes
 {
     public partial class ExtendedLabelledTextBox : LabelledTextBox
     {
-        public new const float CORNER_RADIUS = 8;
-
         public bool CommitOnFocusLoss
         {
             get => Component.CommitOnFocusLost;
             set => Component.CommitOnFocusLost = value;
         }
-
-        public ExtendedLabelledTextBox()
-        {
-            CornerRadius = CORNER_RADIUS;
-        }
     }
 }
diff --git a/PerformanceCalculatorGUI/PerformanceCalculatorGUI.csproj b/PerformanceCalculatorGUI/PerformanceCalculatorGUI.csproj
@@ -6,10 +6,10 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2024.625.2" />
-    <PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2024.625.2" />
-    <PackageReference Include="ppy.osu.Game.Rulesets.Taiko" Version="2024.625.2" />
-    <PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2024.625.2" />
-    <PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2024.625.2" />
+    <PackageReference Include="ppy.osu.Game" Version="2024.731.0" />
+    <PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2024.731.0" />
+    <PackageReference Include="ppy.osu.Game.Rulesets.Taiko" Version="2024.731.0" />
+    <PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2024.731.0" />
+    <PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2024.731.0" />
   </ItemGroup>
 </Project>
diff --git a/PerformanceCalculatorGUI/Screens/ObjectInspection/OsuObjectInspectorRuleset.cs b/PerformanceCalculatorGUI/Screens/ObjectInspection/OsuObjectInspectorRuleset.cs
@@ -33,7 +33,7 @@ public OsuObjectInspectorRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyLis
         protected override void Update()
         {
             base.Update();
-            objectDifficultyValuesContainer.CurrentDifficultyHitObject.Value = difficultyHitObjects.LastOrDefault(x => x.StartTime < Clock.CurrentTime);
+            objectDifficultyValuesContainer.CurrentDifficultyHitObject.Value = difficultyHitObjects.LastOrDefault(x => x.StartTime <= Clock.CurrentTime);
         }
 
         public override bool PropagatePositionalInputSubTree => false;