From f7ebe5a6ae0ee757a2503011f708d962ae5a458e Mon Sep 17 00:00:00 2001 From: StanR Date: Thu, 1 Aug 2024 12:44:24 +0500 Subject: [PATCH] Update packages --- .../Components/ExtendedUserModSelectOverlay.cs | 5 ++--- .../Components/TextBoxes/ExtendedLabelledTextBox.cs | 7 ------- .../PerformanceCalculatorGUI.csproj | 10 +++++----- .../ObjectInspection/OsuObjectInspectorRuleset.cs | 2 +- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/PerformanceCalculatorGUI/Components/ExtendedUserModSelectOverlay.cs b/PerformanceCalculatorGUI/Components/ExtendedUserModSelectOverlay.cs index f9ebab304..f37e09ba4 100644 --- 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 index cee8e3f31..36b28fe9f 100644 --- 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 index 565744680..918f4f101 100644 --- a/PerformanceCalculatorGUI/PerformanceCalculatorGUI.csproj +++ b/PerformanceCalculatorGUI/PerformanceCalculatorGUI.csproj @@ -6,10 +6,10 @@ latest - - - - - + + + + + diff --git a/PerformanceCalculatorGUI/Screens/ObjectInspection/OsuObjectInspectorRuleset.cs b/PerformanceCalculatorGUI/Screens/ObjectInspection/OsuObjectInspectorRuleset.cs index 999148db4..ef725a45e 100644 --- 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;