RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement hover colours

This commit is contained in:
smoogipoo 2017-12-11 21:27:19 +09:00
parent 25d80a36be
commit c12c241633
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
osu.Game/Rulesets/Edit/SelectionLayer.cs
View File

@ -269,11 +269,14 @@ public MarkerContainer()
public class Marker : CompositeDrawable public class Marker : CompositeDrawable
{ {
private const float marker_size = 10;
public Func<RectangleF> GetCaptureRectangle; public Func<RectangleF> GetCaptureRectangle;
public Action<RectangleF> UpdateCapture; public Action<RectangleF> UpdateCapture;
public Action FinishCapture; public Action FinishCapture;
private float marker_size = 10; private Color4 normalColour;
private Color4 hoverColour;
public Marker() public Marker()
{ {
@ -290,7 +293,8 @@ public Marker()
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
Colour = colours.Yellow; Colour = normalColour = colours.Yellow;
hoverColour = colours.YellowDarker;
} }
protected override bool OnDragStart(InputState state) => true; protected override bool OnDragStart(InputState state) => true;
@ -324,12 +328,23 @@ protected override bool OnDragEnd(InputState state)
FinishCapture(); FinishCapture();
return true; return true;
} }
protected override bool OnHover(InputState state)
{
this.FadeColour(hoverColour, 100);
return true;
}
protected override void OnHoverLost(InputState state)
{
this.FadeColour(normalColour, 100);
}
} }
public class CentreMarker : CompositeDrawable public class CentreMarker : CompositeDrawable
{ {
private float marker_size = 10; private const float marker_size = 10;
private float line_width = 2; private const float line_width = 2;
public CentreMarker() public CentreMarker()
{ {