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

Make icon private but expose a protected method

Browse Source
This commit is contained in:
Andrei Zavatski 2020-07-12 12:32:26 +03:00
parent da40f29b44
commit c3524cbe57
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
View File

@ -28,7 +28,7 @@ namespace osu.Game.Overlays.Comments.Buttons
[Resolved] [Resolved]
private OverlayColourProvider colourProvider { get; set; } private OverlayColourProvider colourProvider { get; set; }
protected readonly SpriteIcon Icon; private readonly SpriteIcon icon;
private readonly Box background; private readonly Box background;
private readonly OsuSpriteText text; private readonly OsuSpriteText text;
@ -74,7 +74,7 @@ namespace osu.Game.Overlays.Comments.Buttons
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold) Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold)
}, },
Icon = new SpriteIcon icon = new SpriteIcon
{ {
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
@ -94,14 +94,16 @@ namespace osu.Game.Overlays.Comments.Buttons
private void load() private void load()
{ {
background.Colour = colourProvider.Background2; background.Colour = colourProvider.Background2;
Icon.Colour = colourProvider.Foreground1; icon.Colour = colourProvider.Foreground1;
} }
protected void ToggleIcon(bool upwards) => icon.ScaleTo(new Vector2(1, upwards ? -1 : 1));
protected override bool OnHover(HoverEvent e) protected override bool OnHover(HoverEvent e)
{ {
base.OnHover(e); base.OnHover(e);
background.FadeColour(colourProvider.Background1, 200, Easing.OutQuint); background.FadeColour(colourProvider.Background1, 200, Easing.OutQuint);
Icon.FadeColour(colourProvider.Light1, 200, Easing.OutQuint); icon.FadeColour(colourProvider.Light1, 200, Easing.OutQuint);
return true; return true;
} }
@ -109,7 +111,7 @@ namespace osu.Game.Overlays.Comments.Buttons
{ {
base.OnHoverLost(e); base.OnHoverLost(e);
background.FadeColour(colourProvider.Background2, 200, Easing.OutQuint); background.FadeColour(colourProvider.Background2, 200, Easing.OutQuint);
Icon.FadeColour(colourProvider.Foreground1, 200, Easing.OutQuint); icon.FadeColour(colourProvider.Foreground1, 200, Easing.OutQuint);
} }
protected override bool OnClick(ClickEvent e) protected override bool OnClick(ClickEvent e)

9
osu.Game/Overlays/Comments/Buttons/ShowRepliesButton.cs
View File

@ -3,9 +3,7 @@
using Humanizer; using Humanizer;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osuTK;
namespace osu.Game.Overlays.Comments.Buttons namespace osu.Game.Overlays.Comments.Buttons
{ {
@ -21,12 +19,7 @@ namespace osu.Game.Overlays.Comments.Buttons
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
Expanded.BindValueChanged(onExpandedChanged, true); Expanded.BindValueChanged(expanded => ToggleIcon(expanded.NewValue), true);
}
private void onExpandedChanged(ValueChangedEvent<bool> expanded)
{
Icon.ScaleTo(new Vector2(1, expanded.NewValue ? -1 : 1));
} }
protected override bool OnClick(ClickEvent e) protected override bool OnClick(ClickEvent e)