sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 16:59:53 +09:00
Code Issues Packages Projects Releases Wiki Activity

Move shear constant to overlay (this is going to likely be used everywhere ever)

Browse Source
This commit is contained in:
Dean Herbert
2022-04-20 16:30:58 +09:00
parent e17f224793
commit 65b2db5e71
5 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@ namespace osu.Game.Overlays.Mods
AutoSizeAxes = Axes.X, AutoSizeAxes = Axes.X,
Masking = true, Masking = true,
CornerRadius = ModPanel.CORNER_RADIUS, CornerRadius = ModPanel.CORNER_RADIUS,
Shear = new Vector2(ModPanel.SHEAR_X, 0), Shear = new Vector2(ShearedOverlayContainer.SHEAR, 0),
Children = new Drawable[] Children = new Drawable[]
{ {
underlayBackground = new Box underlayBackground = new Box
@ -98,7 +98,7 @@ namespace osu.Game.Overlays.Mods
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Margin = new MarginPadding { Horizontal = 18 }, Margin = new MarginPadding { Horizontal = 18 },
Shear = new Vector2(-ModPanel.SHEAR_X, 0), Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
Text = "Difficulty Multiplier", Text = "Difficulty Multiplier",
Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold) Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
} }
@ -109,7 +109,7 @@ namespace osu.Game.Overlays.Mods
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Shear = new Vector2(-ModPanel.SHEAR_X, 0), Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
Direction = FillDirection.Horizontal, Direction = FillDirection.Horizontal,
Spacing = new Vector2(2, 0), Spacing = new Vector2(2, 0),
Children = new Drawable[] Children = new Drawable[]

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

@ -79,7 +79,7 @@ namespace osu.Game.Overlays.Mods
Width = 320; Width = 320;
RelativeSizeAxes = Axes.Y; RelativeSizeAxes = Axes.Y;
Shear = new Vector2(ModPanel.SHEAR_X, 0); Shear = new Vector2(ShearedOverlayContainer.SHEAR, 0);
Container controlContainer; Container controlContainer;
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
@ -113,7 +113,7 @@ namespace osu.Game.Overlays.Mods
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
Shear = new Vector2(-ModPanel.SHEAR_X, 0), Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
Padding = new MarginPadding Padding = new MarginPadding
{ {
Horizontal = 17, Horizontal = 17,
@ -193,7 +193,7 @@ namespace osu.Game.Overlays.Mods
Scale = new Vector2(0.8f), Scale = new Vector2(0.8f),
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
LabelText = "Enable All", LabelText = "Enable All",
Shear = new Vector2(-ModPanel.SHEAR_X, 0) Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0)
}); });
panelFlow.Padding = new MarginPadding panelFlow.Padding = new MarginPadding
{ {
@ -260,7 +260,7 @@ namespace osu.Game.Overlays.Mods
var panels = newMods.Select(mod => new ModPanel(mod) var panels = newMods.Select(mod => new ModPanel(mod)
{ {
Shear = new Vector2(-ModPanel.SHEAR_X, 0) Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0)
}); });
Task? loadTask; Task? loadTask;

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

@ -42,7 +42,6 @@ namespace osu.Game.Overlays.Mods
protected const double TRANSITION_DURATION = 150; protected const double TRANSITION_DURATION = 150;
public const float SHEAR_X = 0.2f;
public const float CORNER_RADIUS = 7; public const float CORNER_RADIUS = 7;
protected const float HEIGHT = 42; protected const float HEIGHT = 42;
@ -67,7 +66,7 @@ namespace osu.Game.Overlays.Mods
Content.Masking = true; Content.Masking = true;
Content.CornerRadius = CORNER_RADIUS; Content.CornerRadius = CORNER_RADIUS;
Content.BorderThickness = 2; Content.BorderThickness = 2;
Content.Shear = new Vector2(SHEAR_X, 0); Content.Shear = new Vector2(ShearedOverlayContainer.SHEAR, 0);
Children = new Drawable[] Children = new Drawable[]
{ {
@ -83,7 +82,7 @@ namespace osu.Game.Overlays.Mods
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Active = { BindTarget = Active }, Active = { BindTarget = Active },
Shear = new Vector2(-SHEAR_X, 0), Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
Scale = new Vector2(HEIGHT / ModSwitchSmall.DEFAULT_SIZE) Scale = new Vector2(HEIGHT / ModSwitchSmall.DEFAULT_SIZE)
} }
}, },
@ -116,10 +115,10 @@ namespace osu.Game.Overlays.Mods
{ {
Text = mod.Name, Text = mod.Name,
Font = OsuFont.TorusAlternate.With(size: 18, weight: FontWeight.SemiBold), Font = OsuFont.TorusAlternate.With(size: 18, weight: FontWeight.SemiBold),
Shear = new Vector2(-SHEAR_X, 0), Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
Margin = new MarginPadding Margin = new MarginPadding
{ {
Left = -18 * SHEAR_X Left = -18 * ShearedOverlayContainer.SHEAR
} }
}, },
new OsuSpriteText new OsuSpriteText
@ -128,7 +127,7 @@ namespace osu.Game.Overlays.Mods
Font = OsuFont.Default.With(size: 12), Font = OsuFont.Default.With(size: 12),
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Truncate = true, Truncate = true,
Shear = new Vector2(-SHEAR_X, 0) Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0)
} }
} }
} }

4
osu.Game/Overlays/Mods/ModSelectScreen.cs
View File

@ -93,7 +93,7 @@ namespace osu.Game.Overlays.Mods
Child = columnFlow = new ModColumnContainer Child = columnFlow = new ModColumnContainer
{ {
Direction = FillDirection.Horizontal, Direction = FillDirection.Horizontal,
Shear = new Vector2(ModPanel.SHEAR_X, 0), Shear = new Vector2(SHEAR, 0),
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X, AutoSizeAxes = Axes.X,
Spacing = new Vector2(10, 0), Spacing = new Vector2(10, 0),
@ -284,7 +284,7 @@ namespace osu.Game.Overlays.Mods
{ {
Padding = new MarginPadding Padding = new MarginPadding
{ {
Left = DrawHeight * ModPanel.SHEAR_X, Left = DrawHeight * SHEAR,
Bottom = 10 Bottom = 10
}; };

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

@ -18,6 +18,8 @@ namespace osu.Game.Overlays.Mods
{ {
protected const float PADDING = 14; protected const float PADDING = 14;
public const float SHEAR = 0.2f;
[Cached] [Cached]
protected readonly OverlayColourProvider ColourProvider; protected readonly OverlayColourProvider ColourProvider;