From e096688ac80056e87ea3cbfcc73084627e5ac9f4 Mon Sep 17 00:00:00 2001 From: mcendu Date: Thu, 16 Jan 2020 17:58:47 +0800 Subject: [PATCH] simplify some stuff --- osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs | 6 +----- osu.Game/Rulesets/UI/ModIcon.cs | 5 ++--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs index 7560ad2ce0..443cf59003 100644 --- a/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs +++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs @@ -10,20 +10,16 @@ namespace osu.Game.Tests.Visual.UserInterface { public class TestSceneModButton : OsuTestScene { - private ModButton modButton; - public TestSceneModButton() { Children = new Drawable[] { - modButton = new ModButton(new MultiMod(new TestMod1(), new TestMod2(), new TestMod3(), new TestMod4())) + new ModButton(new MultiMod(new TestMod1(), new TestMod2(), new TestMod3(), new TestMod4())) { Anchor = Anchor.Centre, Origin = Anchor.Centre } }; - - AddStep("left click", () => modButton.SelectNext(1)); } private class TestMod1 : TestMod diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs index 7e22fd2946..3edab0745d 100644 --- a/osu.Game/Rulesets/UI/ModIcon.cs +++ b/osu.Game/Rulesets/UI/ModIcon.cs @@ -68,8 +68,7 @@ namespace osu.Game.Rulesets.UI Anchor = Anchor.Centre, Colour = OsuColour.Gray(84), Alpha = 0, - - Font = OsuFont.Numeric.With(null, size - 57.5f), + Font = OsuFont.Numeric.With(null, 22f), UseFullGlyphHeight = false, Text = mod.Acronym }, @@ -78,7 +77,7 @@ namespace osu.Game.Rulesets.UI Origin = Anchor.Centre, Anchor = Anchor.Centre, Colour = OsuColour.Gray(84), - Size = new Vector2(size - 35), + Size = new Vector2(45), Icon = FontAwesome.Solid.Question }, };