sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix button not transforming correctly in some cases

Browse Source
This commit is contained in:
smoogipoo
2019-09-25 17:42:27 +09:00
parent 028c958431
commit 261ba5c80a
2 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
osu.Game.Tests/Visual/UserInterface/TestSceneSwitchButton.cs
View File

@ -1,20 +1,44 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using NUnit.Framework;
using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osuTK.Input;
namespace osu.Game.Tests.Visual.UserInterface namespace osu.Game.Tests.Visual.UserInterface
{ {
public class TestSceneSwitchButton : OsuTestScene public class TestSceneSwitchButton : ManualInputManagerTestScene
{ {
public TestSceneSwitchButton() private SwitchButton switchButton;
[SetUp]
public void Setup() => Schedule(() =>
{ {
Child = new SwitchButton Child = switchButton = new SwitchButton
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
}; };
});
[Test]
public void TestChangeThroughInput()
{
AddStep("move to switch button", () => InputManager.MoveMouseTo(switchButton));
AddStep("click on", () => InputManager.Click(MouseButton.Left));
AddStep("click off", () => InputManager.Click(MouseButton.Left));
}
[Test]
public void TestChangeThroughBindable()
{
BindableBool bindable = null;
AddStep("bind bindable", () => switchButton.Current.BindTo(bindable = new BindableBool()));
AddStep("toggle bindable", () => bindable.Toggle());
AddStep("toggle bindable", () => bindable.Toggle());
} }
} }
} }

19
osu.Game/Graphics/UserInterface/SwitchButton.cs
View File

@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour; using osu.Framework.Graphics.Colour;
@ -73,20 +74,20 @@ namespace osu.Game.Graphics.UserInterface
switchContainer.Colour = enabledColour; switchContainer.Colour = enabledColour;
fill.Colour = disabledColour; fill.Colour = disabledColour;
updateBorder();
} }
protected override void OnUserChange(bool value) protected override void LoadComplete()
{ {
base.OnUserChange(value); base.LoadComplete();
if (value) Current.BindValueChanged(updateState, true);
switchCircle.MoveToX(switchContainer.DrawWidth - switchCircle.DrawWidth, 200, Easing.OutQuint); FinishTransforms(true);
else }
switchCircle.MoveToX(0, 200, Easing.OutQuint);
fill.FadeTo(value ? 1 : 0, 250, Easing.OutQuint); private void updateState(ValueChangedEvent<bool> state)
{
switchCircle.MoveToX(state.NewValue ? switchContainer.DrawWidth - switchCircle.DrawWidth : 0, 200, Easing.OutQuint);
fill.FadeTo(state.NewValue ? 1 : 0, 250, Easing.OutQuint);
updateBorder(); updateBorder();
} }