h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 22:22:54 +08:00
Code Issues Releases Wiki Activity

Rename ModSelect{Overlay -> }Panel

Browse Source
This commit is contained in:
Bartłomiej Dach 2022-07-22 19:14:39 +02:00
parent a3090003de
commit f3ceabc53f
No known key found for this signature in database
GPG Key ID: BCECCD4FA41F6497
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
View File

@ -60,7 +60,7 @@ namespace osu.Game.Overlays.Mods
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X, AutoSizeAxes = Axes.X,
Masking = true, Masking = true,
CornerRadius = ModSelectOverlayPanel.CORNER_RADIUS, CornerRadius = ModSelectPanel.CORNER_RADIUS,
Shear = new Vector2(ShearedOverlayContainer.SHEAR, 0), Shear = new Vector2(ShearedOverlayContainer.SHEAR, 0),
Children = new Drawable[] Children = new Drawable[]
{ {
@ -69,7 +69,7 @@ namespace osu.Game.Overlays.Mods
Anchor = Anchor.CentreRight, Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight, Origin = Anchor.CentreRight,
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
Width = multiplier_value_area_width + ModSelectOverlayPanel.CORNER_RADIUS Width = multiplier_value_area_width + ModSelectPanel.CORNER_RADIUS
}, },
new GridContainer new GridContainer
{ {
@ -89,7 +89,7 @@ namespace osu.Game.Overlays.Mods
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X, AutoSizeAxes = Axes.X,
Masking = true, Masking = true,
CornerRadius = ModSelectOverlayPanel.CORNER_RADIUS, CornerRadius = ModSelectPanel.CORNER_RADIUS,
Children = new Drawable[] Children = new Drawable[]
{ {
contentBackground = new Box contentBackground = new Box

10
osu.Game/Overlays/Mods/ModColumn.cs
View File

@ -105,20 +105,20 @@ namespace osu.Game.Overlays.Mods
TopLevelContent = new Container TopLevelContent = new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
CornerRadius = ModSelectOverlayPanel.CORNER_RADIUS, CornerRadius = ModSelectPanel.CORNER_RADIUS,
Masking = true, Masking = true,
Children = new Drawable[] Children = new Drawable[]
{ {
new Container new Container
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Height = header_height + ModSelectOverlayPanel.CORNER_RADIUS, Height = header_height + ModSelectPanel.CORNER_RADIUS,
Children = new Drawable[] Children = new Drawable[]
{ {
headerBackground = new Box headerBackground = new Box
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Height = header_height + ModSelectOverlayPanel.CORNER_RADIUS Height = header_height + ModSelectPanel.CORNER_RADIUS
}, },
headerText = new OsuTextFlowContainer(t => headerText = new OsuTextFlowContainer(t =>
{ {
@ -135,7 +135,7 @@ namespace osu.Game.Overlays.Mods
Padding = new MarginPadding Padding = new MarginPadding
{ {
Horizontal = 17, Horizontal = 17,
Bottom = ModSelectOverlayPanel.CORNER_RADIUS Bottom = ModSelectPanel.CORNER_RADIUS
} }
} }
} }
@ -148,7 +148,7 @@ namespace osu.Game.Overlays.Mods
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Masking = true, Masking = true,
CornerRadius = ModSelectOverlayPanel.CORNER_RADIUS, CornerRadius = ModSelectPanel.CORNER_RADIUS,
BorderThickness = 3, BorderThickness = 3,
Children = new Drawable[] Children = new Drawable[]
{ {

2
osu.Game/Overlays/Mods/ModPanel.cs
View File

@ -11,7 +11,7 @@ using osuTK;
namespace osu.Game.Overlays.Mods namespace osu.Game.Overlays.Mods
{ {
public class ModPanel : ModSelectOverlayPanel public class ModPanel : ModSelectPanel
{ {
public Mod Mod => modState.Mod; public Mod Mod => modState.Mod;
public override BindableBool Active => modState.Active; public override BindableBool Active => modState.Active;

2
osu.Game/Overlays/Mods/ModPresetPanel.cs
View File

@ -9,7 +9,7 @@ using osu.Game.Rulesets.Mods;
namespace osu.Game.Overlays.Mods namespace osu.Game.Overlays.Mods
{ {
public class ModPresetPanel : ModSelectOverlayPanel, IHasCustomTooltip<ModPreset> public class ModPresetPanel : ModSelectPanel, IHasCustomTooltip<ModPreset>
{ {
public readonly ModPreset Preset; public readonly ModPreset Preset;

4
osu.Game/Overlays/Mods/ModSelectOverlayPanel.cs → osu.Game/Overlays/Mods/ModSelectPanel.cs
View File

@ -24,7 +24,7 @@ using osuTK.Input;
namespace osu.Game.Overlays.Mods namespace osu.Game.Overlays.Mods
{ {
public abstract class ModSelectOverlayPanel : OsuClickableContainer, IHasAccentColour public abstract class ModSelectPanel : OsuClickableContainer, IHasAccentColour
{ {
public abstract BindableBool Active { get; } public abstract BindableBool Active { get; }
@ -70,7 +70,7 @@ namespace osu.Game.Overlays.Mods
private Sample? sampleOff; private Sample? sampleOff;
private Sample? sampleOn; private Sample? sampleOn;
protected ModSelectOverlayPanel() protected ModSelectPanel()
{ {
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
Height = HEIGHT; Height = HEIGHT;