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

Split dropdown accent colour into hover and selection colours

Browse Source
This commit is contained in:
Bartłomiej Dach
2021-10-16 18:33:17 +02:00
parent 6c18d46443
commit ef03787fe0
6 changed files with 90 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Collections/CollectionFilterDropdown.cs
View File

@ -181,7 +181,11 @@ namespace osu.Game.Collections
MaxHeight = 200; MaxHeight = 200;
} }
protected override DrawableDropdownMenuItem CreateDrawableDropdownMenuItem(MenuItem item) => new CollectionDropdownMenuItem(item); protected override DrawableDropdownMenuItem CreateDrawableDropdownMenuItem(MenuItem item) => new CollectionDropdownMenuItem(item)
{
BackgroundColourHover = HoverColour,
BackgroundColourSelected = SelectionColour
};
} }
protected class CollectionDropdownMenuItem : OsuDropdownMenu.DrawableOsuDropdownMenuItem protected class CollectionDropdownMenuItem : OsuDropdownMenu.DrawableOsuDropdownMenuItem

113
osu.Game/Graphics/UserInterface/OsuDropdown.cs
View File

@ -21,44 +21,17 @@ using osuTK.Graphics;
namespace osu.Game.Graphics.UserInterface namespace osu.Game.Graphics.UserInterface
{ {
public class OsuDropdown<T> : Dropdown<T>, IHasAccentColour public class OsuDropdown<T> : Dropdown<T>
{ {
private const float corner_radius = 5; private const float corner_radius = 5;
private Color4 accentColour;
public Color4 AccentColour
{
get => accentColour;
set
{
accentColour = value;
updateAccentColour();
}
}
[BackgroundDependencyLoader(true)]
private void load(OverlayColourProvider? colourProvider, OsuColour colours)
{
if (accentColour == default)
accentColour = colourProvider?.Light4 ?? colours.PinkDarker;
updateAccentColour();
}
private void updateAccentColour()
{
if (Header is IHasAccentColour header) header.AccentColour = accentColour;
if (Menu is IHasAccentColour menu) menu.AccentColour = accentColour;
}
protected override DropdownHeader CreateHeader() => new OsuDropdownHeader(); protected override DropdownHeader CreateHeader() => new OsuDropdownHeader();
protected override DropdownMenu CreateMenu() => new OsuDropdownMenu(); protected override DropdownMenu CreateMenu() => new OsuDropdownMenu();
#region OsuDropdownMenu #region OsuDropdownMenu
protected class OsuDropdownMenu : DropdownMenu, IHasAccentColour protected class OsuDropdownMenu : DropdownMenu
{ {
public override bool HandleNonPositionalInput => State == MenuState.Open; public override bool HandleNonPositionalInput => State == MenuState.Open;
@ -78,9 +51,11 @@ namespace osu.Game.Graphics.UserInterface
} }
[BackgroundDependencyLoader(true)] [BackgroundDependencyLoader(true)]
private void load(OverlayColourProvider? colourProvider, AudioManager audio) private void load(OverlayColourProvider? colourProvider, OsuColour colours, AudioManager audio)
{ {
BackgroundColour = colourProvider?.Background5 ?? Color4.Black.Opacity(0.5f); BackgroundColour = colourProvider?.Background5 ?? Color4.Black.Opacity(0.5f);
HoverColour = colourProvider?.Highlight1 ?? colours.PinkDarker;
SelectionColour = colourProvider?.Light4 ?? colours.PinkDarker.Opacity(0.5f);
sampleOpen = audio.Samples.Get(@"UI/dropdown-open"); sampleOpen = audio.Samples.Get(@"UI/dropdown-open");
sampleClose = audio.Samples.Get(@"UI/dropdown-close"); sampleClose = audio.Samples.Get(@"UI/dropdown-close");
@ -121,57 +96,77 @@ namespace osu.Game.Graphics.UserInterface
} }
} }
private Color4 accentColour; private Color4 hoverColour;
public Color4 AccentColour public Color4 HoverColour
{ {
get => accentColour; get => hoverColour;
set set
{ {
accentColour = value; hoverColour = value;
foreach (var c in Children.OfType<IHasAccentColour>()) foreach (var c in Children.OfType<DrawableOsuDropdownMenuItem>())
c.AccentColour = value; c.BackgroundColourHover = value;
}
}
private Color4 selectionColour;
public Color4 SelectionColour
{
get => selectionColour;
set
{
selectionColour = value;
foreach (var c in Children.OfType<DrawableOsuDropdownMenuItem>())
c.BackgroundColourSelected = value;
} }
} }
protected override Menu CreateSubMenu() => new OsuMenu(Direction.Vertical); protected override Menu CreateSubMenu() => new OsuMenu(Direction.Vertical);
protected override DrawableDropdownMenuItem CreateDrawableDropdownMenuItem(MenuItem item) => new DrawableOsuDropdownMenuItem(item) { AccentColour = accentColour }; protected override DrawableDropdownMenuItem CreateDrawableDropdownMenuItem(MenuItem item) => new DrawableOsuDropdownMenuItem(item)
{
BackgroundColourHover = HoverColour,
BackgroundColourSelected = SelectionColour
};
protected override ScrollContainer<Drawable> CreateScrollContainer(Direction direction) => new OsuScrollContainer(direction); protected override ScrollContainer<Drawable> CreateScrollContainer(Direction direction) => new OsuScrollContainer(direction);
#region DrawableOsuDropdownMenuItem #region DrawableOsuDropdownMenuItem
public class DrawableOsuDropdownMenuItem : DrawableDropdownMenuItem, IHasAccentColour public class DrawableOsuDropdownMenuItem : DrawableDropdownMenuItem
{ {
// IsHovered is used // IsHovered is used
public override bool HandlePositionalInput => true; public override bool HandlePositionalInput => true;
private Color4? accentColour; public new Color4 BackgroundColourHover
public Color4 AccentColour
{ {
get => accentColour ?? nonAccentSelectedColour; get => base.BackgroundColourHover;
set set
{ {
accentColour = value; base.BackgroundColourHover = value;
updateColours();
}
}
public new Color4 BackgroundColourSelected
{
get => base.BackgroundColourSelected;
set
{
base.BackgroundColourSelected = value;
updateColours(); updateColours();
} }
} }
private void updateColours() private void updateColours()
{ {
BackgroundColourHover = accentColour ?? nonAccentHoverColour;
BackgroundColourSelected = accentColour ?? nonAccentSelectedColour;
BackgroundColour = BackgroundColourHover.Opacity(0); BackgroundColour = BackgroundColourHover.Opacity(0);
UpdateBackgroundColour(); UpdateBackgroundColour();
UpdateForegroundColour(); UpdateForegroundColour();
} }
private Color4 nonAccentHoverColour;
private Color4 nonAccentSelectedColour;
public DrawableOsuDropdownMenuItem(MenuItem item) public DrawableOsuDropdownMenuItem(MenuItem item)
: base(item) : base(item)
{ {
@ -182,12 +177,8 @@ namespace osu.Game.Graphics.UserInterface
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load()
{ {
nonAccentHoverColour = colours.PinkDarker;
nonAccentSelectedColour = Color4.Black.Opacity(0.5f);
updateColours();
AddInternal(new HoverSounds()); AddInternal(new HoverSounds());
} }
@ -290,7 +281,7 @@ namespace osu.Game.Graphics.UserInterface
#endregion #endregion
public class OsuDropdownHeader : DropdownHeader, IHasAccentColour public class OsuDropdownHeader : DropdownHeader
{ {
protected readonly SpriteText Text; protected readonly SpriteText Text;
@ -302,18 +293,6 @@ namespace osu.Game.Graphics.UserInterface
protected readonly SpriteIcon Icon; protected readonly SpriteIcon Icon;
private Color4 accentColour;
public virtual Color4 AccentColour
{
get => accentColour;
set
{
accentColour = value;
BackgroundColourHover = accentColour;
}
}
public OsuDropdownHeader() public OsuDropdownHeader()
{ {
Foreground.Padding = new MarginPadding(10); Foreground.Padding = new MarginPadding(10);
@ -365,7 +344,7 @@ namespace osu.Game.Graphics.UserInterface
private void load(OverlayColourProvider? colourProvider, OsuColour colours) private void load(OverlayColourProvider? colourProvider, OsuColour colours)
{ {
BackgroundColour = colourProvider?.Background5 ?? Color4.Black.Opacity(0.5f); BackgroundColour = colourProvider?.Background5 ?? Color4.Black.Opacity(0.5f);
BackgroundColourHover = colourProvider?.Light4 ?? colours.PinkDarker; BackgroundColourHover = colourProvider?.Highlight1 ?? colours.PinkDarker;
} }
} }
} }

35
osu.Game/Graphics/UserInterface/OsuTabDropdown.cs
View File

@ -11,8 +11,28 @@ using osu.Framework.Input.Events;
namespace osu.Game.Graphics.UserInterface namespace osu.Game.Graphics.UserInterface
{ {
public class OsuTabDropdown<T> : OsuDropdown<T> public class OsuTabDropdown<T> : OsuDropdown<T>, IHasAccentColour
{ {
private Color4 accentColour;
public Color4 AccentColour
{
get => accentColour;
set
{
accentColour = value;
if (Menu is OsuDropdownMenu dropdownMenu)
{
dropdownMenu.HoverColour = value;
dropdownMenu.SelectionColour = value.Opacity(0.5f);
}
if (Header is OsuTabDropdownHeader tabDropdownHeader)
tabDropdownHeader.AccentColour = value;
}
}
public OsuTabDropdown() public OsuTabDropdown()
{ {
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
@ -37,7 +57,7 @@ namespace osu.Game.Graphics.UserInterface
MaxHeight = 400; MaxHeight = 400;
} }
protected override DrawableDropdownMenuItem CreateDrawableDropdownMenuItem(MenuItem item) => new DrawableOsuTabDropdownMenuItem(item) { AccentColour = AccentColour }; protected override DrawableDropdownMenuItem CreateDrawableDropdownMenuItem(MenuItem item) => new DrawableOsuTabDropdownMenuItem(item);
private class DrawableOsuTabDropdownMenuItem : DrawableOsuDropdownMenuItem private class DrawableOsuTabDropdownMenuItem : DrawableOsuDropdownMenuItem
{ {
@ -49,14 +69,17 @@ namespace osu.Game.Graphics.UserInterface
} }
} }
protected class OsuTabDropdownHeader : OsuDropdownHeader protected class OsuTabDropdownHeader : OsuDropdownHeader, IHasAccentColour
{ {
public override Color4 AccentColour private Color4 accentColour;
public Color4 AccentColour
{ {
get => base.AccentColour; get => accentColour;
set set
{ {
base.AccentColour = value; accentColour = value;
BackgroundColourHover = value;
Foreground.Colour = value; Foreground.Colour = value;
} }
} }

8
osu.Game/Overlays/Login/UserDropdown.cs
View File

@ -29,12 +29,6 @@ namespace osu.Game.Overlays.Login
} }
} }
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
AccentColour = colours.Gray5;
}
protected class UserDropdownMenu : OsuDropdownMenu protected class UserDropdownMenu : OsuDropdownMenu
{ {
public UserDropdownMenu() public UserDropdownMenu()
@ -56,6 +50,7 @@ namespace osu.Game.Overlays.Login
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
BackgroundColour = colours.Gray3; BackgroundColour = colours.Gray3;
HoverColour = SelectionColour = colours.Gray5;
} }
protected override DrawableDropdownMenuItem CreateDrawableDropdownMenuItem(MenuItem item) => new DrawableUserDropdownMenuItem(item); protected override DrawableDropdownMenuItem CreateDrawableDropdownMenuItem(MenuItem item) => new DrawableUserDropdownMenuItem(item);
@ -118,6 +113,7 @@ namespace osu.Game.Overlays.Login
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
BackgroundColour = colours.Gray3; BackgroundColour = colours.Gray3;
BackgroundColourHover = colours.Gray5;
} }
} }
} }

8
osu.Game/Overlays/Music/CollectionDropdown.cs
View File

@ -19,12 +19,6 @@ namespace osu.Game.Overlays.Music
{ {
protected override bool ShowManageCollectionsItem => false; protected override bool ShowManageCollectionsItem => false;
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
AccentColour = colours.Gray6;
}
protected override CollectionDropdownHeader CreateCollectionHeader() => new CollectionsHeader(); protected override CollectionDropdownHeader CreateCollectionHeader() => new CollectionsHeader();
protected override CollectionDropdownMenu CreateCollectionMenu() => new CollectionsMenu(); protected override CollectionDropdownMenu CreateCollectionMenu() => new CollectionsMenu();
@ -41,6 +35,7 @@ namespace osu.Game.Overlays.Music
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
BackgroundColour = colours.Gray4; BackgroundColour = colours.Gray4;
HoverColour = SelectionColour = colours.Gray6;
} }
} }
@ -50,6 +45,7 @@ namespace osu.Game.Overlays.Music
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
BackgroundColour = colours.Gray4; BackgroundColour = colours.Gray4;
BackgroundColourHover = colours.Gray6;
} }
public CollectionsHeader() public CollectionsHeader()

11
osu.Game/Overlays/Rankings/SpotlightSelector.cs
View File

@ -175,18 +175,18 @@ namespace osu.Game.Overlays.Rankings
private class SpotlightsDropdown : OsuDropdown<APISpotlight> private class SpotlightsDropdown : OsuDropdown<APISpotlight>
{ {
private DropdownMenu menu; private OsuDropdownMenu menu;
protected override DropdownMenu CreateMenu() => menu = base.CreateMenu().With(m => m.MaxHeight = 400); protected override DropdownMenu CreateMenu() => menu = (OsuDropdownMenu)base.CreateMenu().With(m => m.MaxHeight = 400);
protected override DropdownHeader CreateHeader() => new SpotlightsDropdownHeader(); protected override DropdownHeader CreateHeader() => new SpotlightsDropdownHeader();
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider) private void load(OverlayColourProvider colourProvider)
{ {
// osu-web adds a 0.6 opacity container on top of the 0.5 base one when hovering, 0.8 on a single container here matches the resulting colour
AccentColour = colourProvider.Background6.Opacity(0.8f);
menu.BackgroundColour = colourProvider.Background5; menu.BackgroundColour = colourProvider.Background5;
menu.HoverColour = colourProvider.Background4;
menu.SelectionColour = colourProvider.Background3;
Padding = new MarginPadding { Vertical = 20 }; Padding = new MarginPadding { Vertical = 20 };
} }
@ -205,7 +205,8 @@ namespace osu.Game.Overlays.Rankings
private void load(OverlayColourProvider colourProvider) private void load(OverlayColourProvider colourProvider)
{ {
BackgroundColour = colourProvider.Background6.Opacity(0.5f); BackgroundColour = colourProvider.Background6.Opacity(0.5f);
BackgroundColourHover = colourProvider.Background5; // osu-web adds a 0.6 opacity container on top of the 0.5 base one when hovering, 0.8 on a single container here matches the resulting colour
BackgroundColourHover = colourProvider.Background6.Opacity(0.8f);
} }
} }
} }