h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-22 16:16:07 +08:00
Code Issues Releases Wiki Activity

Move PanelXOffset to init property rather than ctor

Browse Source 
Feels better to me.
This commit is contained in:
Dean Herbert 2025-02-18 16:24:04 +09:00
parent 88ec204d26
commit 5de9584171
No known key found for this signature in database
3 changed files with 21 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
osu.Game/Screens/SelectV2/PanelBase.cs
View File

@ -29,31 +29,25 @@ namespace osu.Game.Screens.SelectV2
private const float duration = 500;
private readonly float panelXOffset;
protected float PanelXOffset { get; init; }
private readonly Box backgroundBorder;
private readonly Box backgroundGradient;
private readonly Box backgroundAccentGradient;
private readonly Container backgroundLayer;
private readonly Container backgroundLayerHorizontalPadding;
private readonly Container backgroundContainer;
private readonly Container iconContainer;
private readonly Box activationFlash;
private readonly Box hoverLayer;
private Box backgroundBorder = null!;
private Box backgroundGradient = null!;
private Box backgroundAccentGradient = null!;
private Container backgroundLayer = null!;
private Container backgroundLayerHorizontalPadding = null!;
private Container backgroundContainer = null!;
private Container iconContainer = null!;
private Box activationFlash = null!;
private Box hoverLayer = null!;
public Container TopLevelContent { get; }
public Container TopLevelContent { get; private set; } = null!;
protected Container Content { get; }
protected Container Content { get; private set; } = null!;
public Drawable Background
{
set => backgroundContainer.Child = value;
}
public Drawable Background { set => backgroundContainer.Child = value; }
public Drawable Icon
{
set => iconContainer.Child = value;
}
public Drawable Icon { set => iconContainer.Child = value; }
private Color4? accentColour;
@ -77,10 +71,9 @@ namespace osu.Game.Screens.SelectV2
return inputRectangle.Contains(TopLevelContent.ToLocalSpace(screenSpacePos));
}
protected PanelBase(float panelXOffset = 0)
[BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider, OsuColour colours)
{
this.panelXOffset = panelXOffset;
RelativeSizeAxes = Axes.Both;
InternalChild = TopLevelContent = new Container
@ -147,7 +140,7 @@ namespace osu.Game.Screens.SelectV2
Content = new Container
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Right = panelXOffset + corner_radius },
Padding = new MarginPadding { Right = PanelXOffset + corner_radius },
},
hoverLayer = new Box
{
@ -165,11 +158,7 @@ namespace osu.Game.Screens.SelectV2
new HoverSounds(),
}
};
}
[BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider, OsuColour colours)
{
hoverLayer.Colour = colours.Blue.Opacity(0.1f);
backgroundGradient.Colour = ColourInfo.GradientHorizontal(colourProvider.Background3, colourProvider.Background4);
}
@ -187,15 +176,11 @@ namespace osu.Game.Screens.SelectV2
protected override bool OnClick(ClickEvent e)
{
activationFlash.FadeOutFromOne(500, Easing.OutQuint);
carousel?.Activate(Item!);
return true;
}
public void Flash()
{
activationFlash.FadeOutFromOne(500, Easing.OutQuint);
}
private void updateDisplay()
{
backgroundLayer.TransformTo(nameof(Padding), backgroundLayer.Padding with { Vertical = Expanded.Value ? 2f : 0f }, duration, Easing.OutQuint);
@ -214,7 +199,7 @@ namespace osu.Game.Screens.SelectV2
private void updateXOffset()
{
float x = panelXOffset + active_x_offset + keyboard_active_x_offset + left_edge_x_offset;
float x = PanelXOffset + active_x_offset + keyboard_active_x_offset + left_edge_x_offset;
if (Expanded.Value)
x -= active_x_offset;

6
osu.Game/Screens/SelectV2/PanelBeatmapSet.cs
View File

@ -21,10 +21,6 @@ namespace osu.Game.Screens.SelectV2
{
public const float HEIGHT = CarouselItem.DEFAULT_HEIGHT * 1.6f;
// todo: this should be replaced with information from CarouselItem about how deep is PanelBeatmap in the carousel
// (i.e. whether it's under a beatmap set that's under a group, or just under a top-level beatmap set).
private const float set_x_offset = 20f; // constant X offset for beatmap set/standalone panels specifically.
private const float duration = 500;
private BeatmapSetPanelBackground background = null!;
@ -43,8 +39,8 @@ namespace osu.Game.Screens.SelectV2
private BeatmapManager beatmaps { get; set; } = null!;
public PanelBeatmapSet()
: base(set_x_offset)
{
PanelXOffset = 20f;
}
[BackgroundDependencyLoader]

6
osu.Game/Screens/SelectV2/PanelBeatmapStandalone.cs
View File

@ -27,10 +27,6 @@ namespace osu.Game.Screens.SelectV2
{
public const float HEIGHT = CarouselItem.DEFAULT_HEIGHT * 1.6f;
// todo: this should be replaced with information from CarouselItem about how deep is PanelBeatmap in the carousel
// (i.e. whether it's under a beatmap set that's under a group, or just under a top-level beatmap set).
private const float standalone_x_offset = 20f; // constant X offset for beatmap set/standalone panels specifically.
private const float duration = 500;
[Resolved]
@ -70,8 +66,8 @@ namespace osu.Game.Screens.SelectV2
private OsuSpriteText difficultyAuthor = null!;
public PanelBeatmapStandalone()
: base(standalone_x_offset)
{
PanelXOffset = 20;
}
[BackgroundDependencyLoader]