From 3da30485b2766242f626798c206940cc52c9f90f Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 12 Sep 2023 17:06:42 +0900 Subject: [PATCH] Move shear spec to correct location --- .../Overlays/Mods/ModEffectPreviewPanel.cs | 20 +++++++++++++++---- .../Overlays/Mods/VerticalAttributeDisplay.cs | 8 +++++--- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs index b9511cc544..c961235cb2 100644 --- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs +++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs @@ -141,10 +141,22 @@ namespace osu.Game.Overlays.Mods Direction = FillDirection.Horizontal, Children = new[] { - circleSizeDisplay = new VerticalAttributeDisplay("CS"), - drainRateDisplay = new VerticalAttributeDisplay("HP"), - approachRateDisplay = new VerticalAttributeDisplay("AR"), - overallDifficultyDisplay = new VerticalAttributeDisplay("OD"), + circleSizeDisplay = new VerticalAttributeDisplay("CS") + { + Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0), + }, + drainRateDisplay = new VerticalAttributeDisplay("HP") + { + Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0), + }, + approachRateDisplay = new VerticalAttributeDisplay("AR") + { + Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0), + }, + overallDifficultyDisplay = new VerticalAttributeDisplay("OD") + { + Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0), + }, } } } diff --git a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs index ba8efd1c2b..60cc875dbb 100644 --- a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs +++ b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs @@ -10,7 +10,6 @@ using osu.Framework.Localisation; using osu.Game.Graphics; using osu.Game.Graphics.Sprites; using osu.Game.Graphics.UserInterface; -using osuTK; namespace osu.Game.Overlays.Mods { @@ -32,9 +31,12 @@ namespace osu.Game.Overlays.Mods public VerticalAttributeDisplay(LocalisableString label) { Label = label; + AutoSizeAxes = Axes.X; - Origin = Anchor = Anchor.CentreLeft; - Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0); + + Origin = Anchor.CentreLeft; + Anchor = Anchor.CentreLeft; + InternalChild = new FillFlowContainer { Origin = Anchor.CentreLeft,