1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 13:37:25 +08:00

Tidy up visual look

This commit is contained in:
Dean Herbert 2023-12-19 19:18:36 +09:00
parent 07bb0805e9
commit 3b848e8503
No known key found for this signature in database
4 changed files with 47 additions and 26 deletions

View File

@ -3,9 +3,9 @@
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Effects;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Graphics; using osu.Game.Graphics;
@ -67,12 +67,24 @@ namespace osu.Game.Screens.Select
public BeatmapDetails() public BeatmapDetails()
{ {
CornerRadius = 10;
Masking = true;
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Glow,
Hollow = true,
Colour = new Color4(130, 204, 255, 15),
Radius = 10,
};
Children = new Drawable[] Children = new Drawable[]
{ {
new Box new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = Color4.Black.Opacity(0.5f), Colour = new Color4(130, 204, 255, 40),
Blending = BlendingParameters.Additive,
}, },
new Container new Container
{ {
@ -122,7 +134,8 @@ namespace osu.Game.Screens.Select
}, },
new OsuScrollContainer new OsuScrollContainer
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.X,
Height = 250,
Width = 0.5f, Width = 0.5f,
ScrollbarVisible = false, ScrollbarVisible = false,
Padding = new MarginPadding { Left = spacing / 2 }, Padding = new MarginPadding { Left = spacing / 2 },
@ -271,11 +284,6 @@ namespace osu.Game.Screens.Select
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black.Opacity(0.5f),
},
content = new Container content = new Container
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,

View File

@ -61,7 +61,7 @@ namespace osu.Game.Screens.Select
{ {
Type = EdgeEffectType.Glow, Type = EdgeEffectType.Glow,
Colour = new Color4(130, 204, 255, 150), Colour = new Color4(130, 204, 255, 150),
Radius = 20, Radius = 15,
Roundness = 15, Roundness = 15,
}; };
} }

View File

@ -311,23 +311,36 @@ namespace osu.Game.Screens.Select.Details
Font = OsuFont.GetFont(size: 12) Font = OsuFont.GetFont(size: 12)
}, },
}, },
bar = new Bar new Container
{ {
Origin = Anchor.CentreLeft, RelativeSizeAxes = Axes.Both,
Anchor = Anchor.CentreLeft,
RelativeSizeAxes = Axes.X,
Height = 5,
BackgroundColour = Color4.White.Opacity(0.5f),
Padding = new MarginPadding { Left = name_width + 10, Right = value_width + 10 },
},
ModBar = new Bar
{
Origin = Anchor.CentreLeft,
Anchor = Anchor.CentreLeft,
RelativeSizeAxes = Axes.X,
Alpha = 0.5f,
Height = 5,
Padding = new MarginPadding { Left = name_width + 10, Right = value_width + 10 }, Padding = new MarginPadding { Left = name_width + 10, Right = value_width + 10 },
Children = new Drawable[]
{
new Container
{
Origin = Anchor.CentreLeft,
Anchor = Anchor.CentreLeft,
RelativeSizeAxes = Axes.X,
Height = 5,
CornerRadius = 2,
Masking = true,
Children = new Drawable[]
{
bar = new Bar
{
RelativeSizeAxes = Axes.Both,
BackgroundColour = Color4.White.Opacity(0.5f),
},
ModBar = new Bar
{
RelativeSizeAxes = Axes.Both,
Alpha = 0.5f,
},
}
},
}
}, },
new Container new Container
{ {

View File

@ -240,7 +240,7 @@ namespace osu.Game.Screens.Select
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Top = left_area_padding }, Padding = new MarginPadding { Top = 5 },
Children = new Drawable[] Children = new Drawable[]
{ {
new LeftSideInteractionContainer(() => Carousel.ScrollToSelected()) new LeftSideInteractionContainer(() => Carousel.ScrollToSelected())
@ -264,7 +264,7 @@ namespace osu.Game.Screens.Select
Padding = new MarginPadding(10) Padding = new MarginPadding(10)
{ {
Left = left_area_padding, Left = left_area_padding,
Right = left_area_padding * 2, Right = left_area_padding * 2 + 5,
}, },
Y = WEDGE_HEIGHT, Y = WEDGE_HEIGHT,
Children = new Drawable[] Children = new Drawable[]