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

Integrate editor colour display with colour picker & popover

Browse Source
This commit is contained in:
Bartłomiej Dach 2021-06-20 20:20:46 +02:00
parent 0691c0dd63
commit c8891d4504
No known key found for this signature in database
GPG Key ID: BCECCD4FA41F6497
2 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
View File

@ -3,11 +3,14 @@
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.UserInterface; using osu.Framework.Graphics.UserInterface;
using osu.Framework.Localisation; using osu.Framework.Localisation;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osuTK; using osuTK;
@ -16,7 +19,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
/// <summary> /// <summary>
/// A component which displays a colour along with related description text. /// A component which displays a colour along with related description text.
/// </summary> /// </summary>
public class ColourDisplay : CompositeDrawable, IHasCurrentValue<Colour4> public class ColourDisplay : CompositeDrawable, IHasCurrentValue<Colour4>, IHasPopover
{ {
private readonly BindableWithCurrent<Colour4> current = new BindableWithCurrent<Colour4>(); private readonly BindableWithCurrent<Colour4> current = new BindableWithCurrent<Colour4>();
@ -60,10 +63,11 @@ namespace osu.Game.Graphics.UserInterfaceV2
Spacing = new Vector2(0, 10), Spacing = new Vector2(0, 10),
Children = new Drawable[] Children = new Drawable[]
{ {
new CircularContainer new OsuClickableContainer
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Height = 100, Height = 100,
CornerRadius = 50,
Masking = true, Masking = true,
Children = new Drawable[] Children = new Drawable[]
{ {
@ -77,7 +81,8 @@ namespace osu.Game.Graphics.UserInterfaceV2
Origin = Anchor.Centre, Origin = Anchor.Centre,
Font = OsuFont.Default.With(size: 12) Font = OsuFont.Default.With(size: 12)
} }
} },
Action = this.ShowPopover
}, },
colourName = new OsuSpriteText colourName = new OsuSpriteText
{ {
@ -101,5 +106,13 @@ namespace osu.Game.Graphics.UserInterfaceV2
colourHexCode.Text = current.Value.ToHex(); colourHexCode.Text = current.Value.ToHex();
colourHexCode.Colour = OsuColour.ForegroundTextColourFor(current.Value); colourHexCode.Colour = OsuColour.ForegroundTextColourFor(current.Value);
} }
public Popover GetPopover() => new OsuPopover(false)
{
Child = new OsuColourPicker
{
Current = { BindTarget = Current }
}
};
} }
} }

20
osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System.Collections.Specialized;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
@ -72,14 +73,17 @@ namespace osu.Game.Graphics.UserInterfaceV2
{ {
base.LoadComplete(); base.LoadComplete();
Colours.BindCollectionChanged((_, __) => updatePalette(), true); Colours.BindCollectionChanged((_, args) => updatePalette(args), true);
FinishTransforms(true); FinishTransforms(true);
} }
private const int fade_duration = 200; private const int fade_duration = 200;
private void updatePalette() private void updatePalette(NotifyCollectionChangedEventArgs args)
{ {
if (args.Action == NotifyCollectionChangedAction.Replace)
return;
palette.Clear(); palette.Clear();
if (Colours.Any()) if (Colours.Any())
@ -93,12 +97,18 @@ namespace osu.Game.Graphics.UserInterfaceV2
placeholder.FadeIn(fade_duration, Easing.OutQuint); placeholder.FadeIn(fade_duration, Easing.OutQuint);
} }
foreach (var item in Colours) for (int i = 0; i < Colours.Count; ++i)
{ {
palette.Add(new ColourDisplay // copy to avoid accesses to modified closure.
int colourIndex = i;
ColourDisplay display;
palette.Add(display = new ColourDisplay
{ {
Current = { Value = item } Current = { Value = Colours[colourIndex] }
}); });
display.Current.BindValueChanged(colour => Colours[colourIndex] = colour.NewValue);
} }
reindexItems(); reindexItems();