h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-26 20:50:41 +08:00
Code Issues Releases Wiki Activity

Apply extracted background in one more location

Browse Source
This commit is contained in:
Bartłomiej Dach
2026-01-27 12:09:31 +01:00
Unverified
parent 6fad798227
commit add67b95c7
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Screens/Edit/Components/FormSampleSet.cs
+4 -9
View File
@@ -15,7 +15,6 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.UserInterface;
using osu.Framework.Input.Events;
@@ -48,7 +47,7 @@ namespace osu.Game.Screens.Edit.Components
private readonly BindableWithCurrent<EditorBeatmapSkin.SampleSet?> current = new BindableWithCurrent<EditorBeatmapSkin.SampleSet?>();
private readonly Dictionary<(string name, string bank), SampleButton> buttons = new Dictionary<(string, string), SampleButton>();
private Box background = null!;
private FormControlBackground background = null!;
private FormFieldCaption caption = null!;
[Resolved]
@@ -62,13 +61,13 @@ namespace osu.Game.Screens.Edit.Components
Masking = true;
CornerRadius = 5;
CornerExponent = 2.5f;
InternalChildren = new Drawable[]
{
background = new Box
background = new FormControlBackground
{
RelativeSizeAxes = Axes.Both,
Colour = colourProvider.Background5,
},
new FillFlowContainer
{
@@ -167,13 +166,9 @@ namespace osu.Game.Screens.Edit.Components
private void updateState()
{
background.Colour = colourProvider.Background5;
caption.Colour = colourProvider.Content2;
BorderThickness = IsHovered ? 2 : 0;
if (IsHovered)
BorderColour = colourProvider.Light4;
background.VisualStyle = IsHovered ? VisualStyle.Hovered : VisualStyle.Normal;
}
public partial class SampleButton : OsuButton, IHasPopover, IHasContextMenu