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

Add drag bar on chat overlay to better signal resizability

Browse Source
This commit is contained in:
Dean Herbert 2023-11-24 16:39:54 +09:00
parent 36b45d34f7
commit 7600595e5d
No known key found for this signature in database
1 changed files with 76 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
osu.Game/Overlays/Chat/ChatOverlayTopBar.cs
View File

@ -2,7 +2,6 @@
// 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 osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
@ -23,6 +22,8 @@ namespace osu.Game.Overlays.Chat
private Color4 backgroundColour; private Color4 backgroundColour;
public Drawable DragBar = null!;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider, TextureStore textures) private void load(OverlayColourProvider colourProvider, TextureStore textures)
{ {
@ -50,7 +51,7 @@ namespace osu.Game.Overlays.Chat
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Texture = textures.Get("Icons/Hexacons/messaging"), Texture = textures.Get("Icons/Hexacons/messaging"),
Size = new Vector2(18), Size = new Vector2(24),
}, },
// Placeholder text // Placeholder text
new OsuSpriteText new OsuSpriteText
@ -64,19 +65,90 @@ namespace osu.Game.Overlays.Chat
}, },
}, },
}, },
DragBar = new DragArea
{
Alpha = 0,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Colour = colourProvider.Background4,
}
}; };
} }
protected override bool OnHover(HoverEvent e) protected override bool OnHover(HoverEvent e)
{ {
background.FadeColour(backgroundColour.Lighten(0.1f), 300, Easing.OutQuint); DragBar.FadeIn(100);
return base.OnHover(e); return base.OnHover(e);
} }
protected override void OnHoverLost(HoverLostEvent e) protected override void OnHoverLost(HoverLostEvent e)
{ {
background.FadeColour(backgroundColour, 300, Easing.OutQuint); DragBar.FadeOut(100);
base.OnHoverLost(e); base.OnHoverLost(e);
} }
private partial class DragArea : CompositeDrawable
{
private readonly Circle circle;
public DragArea()
{
AutoSizeAxes = Axes.Both;
InternalChildren = new Drawable[]
{
circle = new Circle
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Size = new Vector2(150, 7),
Margin = new MarginPadding(12),
}
};
}
protected override bool OnHover(HoverEvent e)
{
updateScale();
return base.OnHover(e);
}
protected override void OnHoverLost(HoverLostEvent e)
{
updateScale();
base.OnHoverLost(e);
}
private bool dragging;
protected override bool OnMouseDown(MouseDownEvent e)
{
dragging = true;
updateScale();
return base.OnMouseDown(e);
}
protected override void OnMouseUp(MouseUpEvent e)
{
dragging = false;
updateScale();
base.OnMouseUp(e);
}
private void updateScale()
{
if (dragging || IsHovered)
circle.FadeIn(100);
else
circle.FadeTo(0.6f, 100);
if (dragging)
circle.ScaleTo(1f, 400, Easing.OutQuint);
else if (IsHovered)
circle.ScaleTo(1.05f, 400, Easing.OutElasticHalf);
else
circle.ScaleTo(1f, 500, Easing.OutQuint);
}
}
} }
} }