From 3cb9cb647d447a00929a7621f35b95f5be35e8cc Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 5 Dec 2016 21:36:42 +0900 Subject: [PATCH] Tidy up BackButton and adjust transitions a bit. --- osu.Game/Graphics/UserInterface/BackButton.cs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/osu.Game/Graphics/UserInterface/BackButton.cs b/osu.Game/Graphics/UserInterface/BackButton.cs index 7ccc5c061b..8d173384c3 100644 --- a/osu.Game/Graphics/UserInterface/BackButton.cs +++ b/osu.Game/Graphics/UserInterface/BackButton.cs @@ -16,13 +16,10 @@ namespace osu.Game.Graphics.UserInterface { private TextAwesome icon; - private Container leftContainer; - private Container rightContainer; - private Box leftBox; private Box rightBox; - private const double transform_time = 300.0; + private const double transform_time = 600; private const int pulse_length = 250; private const float shear = 0.1f; @@ -36,7 +33,7 @@ namespace osu.Game.Graphics.UserInterface Children = new Drawable[] { - leftContainer = new Container + new Container { RelativeSizeAxes = Axes.Both, Width = 0.4f, @@ -56,7 +53,7 @@ namespace osu.Game.Graphics.UserInterface }, } }, - rightContainer = new Container + new Container { Origin = Anchor.TopRight, Anchor = Anchor.TopRight, @@ -84,10 +81,7 @@ namespace osu.Game.Graphics.UserInterface }; } - public override bool Contains(Vector2 screenSpacePos) - { - return leftBox.Contains(screenSpacePos) || rightBox.Contains(screenSpacePos); - } + public override bool Contains(Vector2 screenSpacePos) => leftBox.Contains(screenSpacePos) || rightBox.Contains(screenSpacePos); protected override bool OnHover(InputState state) {