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

Use virtual property for OsuTabControl.AccentColour

Browse Source
This commit is contained in:
Andrei Zavatski
2020-01-26 17:21:22 +03:00
parent 891f9a9b18
commit e54ea92c60
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Graphics/UserInterface/OsuTabControl.cs
View File

@ -23,14 +23,17 @@ namespace osu.Game.Graphics.UserInterface
{ {
private Color4 accentColour; private Color4 accentColour;
public Color4 AccentColour public virtual Color4 AccentColour
{ {
get => accentColour; get => accentColour;
set set
{ {
accentColour = value; accentColour = value;
OnAccentColourChanged(value); if (Dropdown is IHasAccentColour dropdown)
dropdown.AccentColour = value;
foreach (var i in TabContainer.Children.OfType<IHasAccentColour>())
i.AccentColour = value;
} }
} }
@ -90,14 +93,6 @@ namespace osu.Game.Graphics.UserInterface
strip.Width = Interpolation.ValueAt(Math.Clamp(Clock.ElapsedFrameTime, 0, 1000), strip.Width, StripWidth, 0, 500, Easing.OutQuint); strip.Width = Interpolation.ValueAt(Math.Clamp(Clock.ElapsedFrameTime, 0, 1000), strip.Width, StripWidth, 0, 500, Easing.OutQuint);
} }
protected virtual void OnAccentColourChanged(Color4 colour)
{
if (Dropdown is IHasAccentColour dropdown)
dropdown.AccentColour = colour;
foreach (var i in TabContainer.Children.OfType<IHasAccentColour>())
i.AccentColour = colour;
}
public class OsuTabItem : TabItem<T>, IHasAccentColour public class OsuTabItem : TabItem<T>, IHasAccentColour
{ {
protected readonly SpriteText Text; protected readonly SpriteText Text;

12
osu.Game/Overlays/OverlayTabControl.cs
View File

@ -22,6 +22,12 @@ namespace osu.Game.Overlays
set => bar.Height = value; set => bar.Height = value;
} }
public override Color4 AccentColour
{
get => base.AccentColour;
set => base.AccentColour = bar.Colour = value;
}
protected OverlayTabControl() protected OverlayTabControl()
{ {
TabContainer.Masking = false; TabContainer.Masking = false;
@ -36,12 +42,6 @@ namespace osu.Game.Overlays
}); });
} }
protected override void OnAccentColourChanged(Color4 colour)
{
base.OnAccentColourChanged(colour);
bar.Colour = colour;
}
protected override Dropdown<T> CreateDropdown() => null; protected override Dropdown<T> CreateDropdown() => null;
protected override TabItem<T> CreateTabItem(T value) => new OverlayTabItem(value); protected override TabItem<T> CreateTabItem(T value) => new OverlayTabItem(value);