mirror of
https://github.com/ppy/osu.git
synced 2024-11-15 16:27:43 +08:00
Add basic hover states for file selector elements
This commit is contained in:
parent
cec3f1487a
commit
cbeeb4a2b4
@ -24,6 +24,7 @@ using osu.Game.Database;
|
|||||||
using osu.Game.Graphics.Sprites;
|
using osu.Game.Graphics.Sprites;
|
||||||
using osu.Game.Overlays;
|
using osu.Game.Overlays;
|
||||||
using osuTK;
|
using osuTK;
|
||||||
|
using osuTK.Graphics;
|
||||||
|
|
||||||
namespace osu.Game.Graphics.UserInterfaceV2
|
namespace osu.Game.Graphics.UserInterfaceV2
|
||||||
{
|
{
|
||||||
@ -254,8 +255,22 @@ namespace osu.Game.Graphics.UserInterfaceV2
|
|||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
private void load(OverlayColourProvider colourProvider)
|
private void load(OverlayColourProvider colourProvider)
|
||||||
{
|
{
|
||||||
Body.BorderThickness = 2;
|
Add(new Container
|
||||||
Body.BorderColour = colourProvider.Highlight1;
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Masking = true,
|
||||||
|
BorderThickness = 2,
|
||||||
|
CornerRadius = 10,
|
||||||
|
BorderColour = colourProvider.Highlight1,
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
new Box
|
||||||
|
{
|
||||||
|
Colour = Color4.Transparent,
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -80,7 +80,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
|
|||||||
|
|
||||||
AddRangeInternal(new Drawable[]
|
AddRangeInternal(new Drawable[]
|
||||||
{
|
{
|
||||||
new Background
|
new OsuFileSelectorBackgroundLayer(0.5f)
|
||||||
{
|
{
|
||||||
Depth = 1
|
Depth = 1
|
||||||
},
|
},
|
||||||
@ -101,24 +101,6 @@ namespace osu.Game.Graphics.UserInterfaceV2
|
|||||||
protected override SpriteText CreateSpriteText() => new OsuSpriteText().With(t => t.Font = OsuFont.Default.With(weight: FontWeight.SemiBold));
|
protected override SpriteText CreateSpriteText() => new OsuSpriteText().With(t => t.Font = OsuFont.Default.With(weight: FontWeight.SemiBold));
|
||||||
|
|
||||||
protected override IconUsage? Icon => Directory.Name.Contains(Path.DirectorySeparatorChar) ? FontAwesome.Solid.Database : null;
|
protected override IconUsage? Icon => Directory.Name.Contains(Path.DirectorySeparatorChar) ? FontAwesome.Solid.Database : null;
|
||||||
|
|
||||||
internal partial class Background : CompositeDrawable
|
|
||||||
{
|
|
||||||
[BackgroundDependencyLoader]
|
|
||||||
private void load(OverlayColourProvider overlayColourProvider)
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.Both;
|
|
||||||
|
|
||||||
Masking = true;
|
|
||||||
CornerRadius = 5;
|
|
||||||
|
|
||||||
InternalChild = new Box
|
|
||||||
{
|
|
||||||
Colour = overlayColourProvider.Background3,
|
|
||||||
RelativeSizeAxes = Axes.Both,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -7,7 +7,6 @@ using osu.Framework.Graphics;
|
|||||||
using osu.Framework.Graphics.Sprites;
|
using osu.Framework.Graphics.Sprites;
|
||||||
using osu.Framework.Graphics.UserInterface;
|
using osu.Framework.Graphics.UserInterface;
|
||||||
using osu.Game.Graphics.Sprites;
|
using osu.Game.Graphics.Sprites;
|
||||||
using osu.Game.Graphics.UserInterface;
|
|
||||||
|
|
||||||
namespace osu.Game.Graphics.UserInterfaceV2
|
namespace osu.Game.Graphics.UserInterfaceV2
|
||||||
{
|
{
|
||||||
@ -24,10 +23,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
|
|||||||
Flow.AutoSizeAxes = Axes.X;
|
Flow.AutoSizeAxes = Axes.X;
|
||||||
Flow.Height = OsuDirectorySelector.ITEM_HEIGHT;
|
Flow.Height = OsuDirectorySelector.ITEM_HEIGHT;
|
||||||
|
|
||||||
AddRangeInternal(new Drawable[]
|
AddInternal(new OsuFileSelectorBackgroundLayer());
|
||||||
{
|
|
||||||
new HoverClickSounds()
|
|
||||||
});
|
|
||||||
|
|
||||||
Colour = colours.Orange1;
|
Colour = colours.Orange1;
|
||||||
}
|
}
|
||||||
|
@ -11,7 +11,6 @@ using osu.Framework.Graphics.Sprites;
|
|||||||
using osu.Framework.Graphics.UserInterface;
|
using osu.Framework.Graphics.UserInterface;
|
||||||
using osu.Game.Graphics.Containers;
|
using osu.Game.Graphics.Containers;
|
||||||
using osu.Game.Graphics.Sprites;
|
using osu.Game.Graphics.Sprites;
|
||||||
using osu.Game.Graphics.UserInterface;
|
|
||||||
using osu.Game.Overlays;
|
using osu.Game.Overlays;
|
||||||
|
|
||||||
namespace osu.Game.Graphics.UserInterfaceV2
|
namespace osu.Game.Graphics.UserInterfaceV2
|
||||||
@ -87,10 +86,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
|
|||||||
Flow.AutoSizeAxes = Axes.X;
|
Flow.AutoSizeAxes = Axes.X;
|
||||||
Flow.Height = OsuDirectorySelector.ITEM_HEIGHT;
|
Flow.Height = OsuDirectorySelector.ITEM_HEIGHT;
|
||||||
|
|
||||||
AddRangeInternal(new Drawable[]
|
AddInternal(new OsuFileSelectorBackgroundLayer());
|
||||||
{
|
|
||||||
new HoverClickSounds()
|
|
||||||
});
|
|
||||||
|
|
||||||
Colour = colourProvider.Light3;
|
Colour = colourProvider.Light3;
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,59 @@
|
|||||||
|
// 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.
|
||||||
|
|
||||||
|
using osu.Framework.Allocation;
|
||||||
|
using osu.Framework.Graphics;
|
||||||
|
using osu.Framework.Graphics.Containers;
|
||||||
|
using osu.Framework.Graphics.Shapes;
|
||||||
|
using osu.Framework.Input.Events;
|
||||||
|
using osu.Game.Graphics.UserInterface;
|
||||||
|
using osu.Game.Overlays;
|
||||||
|
|
||||||
|
namespace osu.Game.Graphics.UserInterfaceV2
|
||||||
|
{
|
||||||
|
internal partial class OsuFileSelectorBackgroundLayer : CompositeDrawable
|
||||||
|
{
|
||||||
|
private Box background = null!;
|
||||||
|
|
||||||
|
private readonly float defaultAlpha;
|
||||||
|
|
||||||
|
public OsuFileSelectorBackgroundLayer(float defaultAlpha = 0f)
|
||||||
|
{
|
||||||
|
Depth = float.MaxValue;
|
||||||
|
|
||||||
|
this.defaultAlpha = defaultAlpha;
|
||||||
|
}
|
||||||
|
|
||||||
|
[BackgroundDependencyLoader]
|
||||||
|
private void load(OverlayColourProvider overlayColourProvider)
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both;
|
||||||
|
|
||||||
|
Masking = true;
|
||||||
|
CornerRadius = 5;
|
||||||
|
|
||||||
|
InternalChildren = new Drawable[]
|
||||||
|
{
|
||||||
|
new HoverClickSounds(),
|
||||||
|
background = new Box
|
||||||
|
{
|
||||||
|
Alpha = defaultAlpha,
|
||||||
|
Colour = overlayColourProvider.Background3,
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override bool OnHover(HoverEvent e)
|
||||||
|
{
|
||||||
|
background.FadeTo(1, 200, Easing.OutQuint);
|
||||||
|
return base.OnHover(e);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void OnHoverLost(HoverLostEvent e)
|
||||||
|
{
|
||||||
|
base.OnHoverLost(e);
|
||||||
|
background.FadeTo(defaultAlpha, 500, Easing.OutQuint);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user