sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-05 12:57:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up constants and method naming

Browse Source
This commit is contained in:
Dean Herbert 2019-10-14 21:32:16 +09:00
parent ae1a361f9f
commit e191c2c50e
3 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Overlays/Comments/CommentsHeader.cs
View File

@ -15,10 +15,7 @@ namespace osu.Game.Overlays.Comments
{ {
public class CommentsHeader : CompositeDrawable public class CommentsHeader : CompositeDrawable
{ {
private const int height = 40; private const int font_size = 14;
private const int spacing = 10;
private const int padding = 50;
private const int text_size = 14;
public readonly Bindable<CommentsSortCriteria> Sort = new Bindable<CommentsSortCriteria>(); public readonly Bindable<CommentsSortCriteria> Sort = new Bindable<CommentsSortCriteria>();
public readonly BindableBool ShowDeleted = new BindableBool(); public readonly BindableBool ShowDeleted = new BindableBool();
@ -28,7 +25,8 @@ namespace osu.Game.Overlays.Comments
public CommentsHeader() public CommentsHeader()
{ {
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
Height = height; Height = 40;
AddRangeInternal(new Drawable[] AddRangeInternal(new Drawable[]
{ {
background = new Box background = new Box
@ -38,14 +36,14 @@ namespace osu.Game.Overlays.Comments
new Container new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Horizontal = padding }, Padding = new MarginPadding { Horizontal = 50 },
Children = new Drawable[] Children = new Drawable[]
{ {
new FillFlowContainer new FillFlowContainer
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal, Direction = FillDirection.Horizontal,
Spacing = new Vector2(spacing, 0), Spacing = new Vector2(10, 0),
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
Children = new Drawable[] Children = new Drawable[]
@ -54,7 +52,7 @@ namespace osu.Game.Overlays.Comments
{ {
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
Font = OsuFont.GetFont(size: text_size), Font = OsuFont.GetFont(size: font_size),
Text = @"Sort by" Text = @"Sort by"
}, },
new SortSelector new SortSelector
@ -107,7 +105,7 @@ namespace osu.Game.Overlays.Comments
{ {
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
Font = OsuFont.GetFont(size: text_size), Font = OsuFont.GetFont(size: font_size),
Text = @"Show deleted" Text = @"Show deleted"
} }
}, },

19
osu.Game/Overlays/Comments/HeaderButton.cs
View File

@ -13,10 +13,7 @@ namespace osu.Game.Overlays.Comments
{ {
public class HeaderButton : Container public class HeaderButton : Container
{ {
private const int height = 20; private const int transition_duration = 200;
private const int corner_radius = 3;
private const int margin = 10;
private const int duration = 200;
protected override Container<Drawable> Content => content; protected override Container<Drawable> Content => content;
@ -26,9 +23,9 @@ namespace osu.Game.Overlays.Comments
public HeaderButton() public HeaderButton()
{ {
AutoSizeAxes = Axes.X; AutoSizeAxes = Axes.X;
Height = height; Height = 20;
Masking = true; Masking = true;
CornerRadius = corner_radius; CornerRadius = 3;
AddRangeInternal(new Drawable[] AddRangeInternal(new Drawable[]
{ {
background = new Box background = new Box
@ -41,7 +38,7 @@ namespace osu.Game.Overlays.Comments
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Margin = new MarginPadding { Horizontal = margin } Margin = new MarginPadding { Horizontal = 10 }
}, },
new HoverClickSounds(), new HoverClickSounds(),
}); });
@ -55,18 +52,18 @@ namespace osu.Game.Overlays.Comments
protected override bool OnHover(HoverEvent e) protected override bool OnHover(HoverEvent e)
{ {
FadeInBackground(); ShowBackground();
return base.OnHover(e); return base.OnHover(e);
} }
protected override void OnHoverLost(HoverLostEvent e) protected override void OnHoverLost(HoverLostEvent e)
{ {
base.OnHoverLost(e); base.OnHoverLost(e);
FadeOutBackground(); HideBackground();
} }
protected void FadeInBackground() => background.FadeIn(duration, Easing.OutQuint); protected void ShowBackground() => background.FadeIn(transition_duration, Easing.OutQuint);
protected void FadeOutBackground() => background.FadeOut(duration, Easing.OutQuint); protected void HideBackground() => background.FadeOut(transition_duration, Easing.OutQuint);
} }
} }

4
osu.Game/Overlays/Comments/SortSelector.cs
View File

@ -75,7 +75,7 @@ namespace osu.Game.Overlays.Comments
public void Activate() public void Activate()
{ {
FadeInBackground(); ShowBackground();
text.Font = text.Font.With(weight: FontWeight.Bold); text.Font = text.Font.With(weight: FontWeight.Bold);
text.Colour = colours.BlueLighter; text.Colour = colours.BlueLighter;
} }
@ -83,7 +83,7 @@ namespace osu.Game.Overlays.Comments
public void Deactivate() public void Deactivate()
{ {
if (!IsHovered) if (!IsHovered)
FadeOutBackground(); HideBackground();
text.Font = text.Font.With(weight: FontWeight.Medium); text.Font = text.Font.With(weight: FontWeight.Medium);
text.Colour = Color4.White; text.Colour = Color4.White;