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

Fix issue for user hover blur for now by checking for current screen, fix test.

Browse Source
This commit is contained in:
David Zhao
2019-02-28 16:18:46 +09:00
parent 4ceafef79c
commit dbe5887f7e
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
osu.Game.Tests/Visual/TestCaseBackgroundScreenBeatmap.cs
View File

@ -11,6 +11,8 @@ using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Events;
using osu.Framework.Input.States;
using osu.Framework.Platform; using osu.Framework.Platform;
using osu.Framework.Screens; using osu.Framework.Screens;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
@ -123,12 +125,11 @@ namespace osu.Game.Tests.Visual
InputManager.MoveMouseTo(playerLoader.ScreenPos); InputManager.MoveMouseTo(playerLoader.ScreenPos);
}); });
AddUntilStep(() => player?.IsLoaded ?? false, "Wait for player to load"); AddUntilStep(() => player?.IsLoaded ?? false, "Wait for player to load");
AddStep("Trigger hover event", () => playerLoader.TriggerOnHover());
AddAssert("Background retained from song select", () => songSelect.IsBackgroundCurrent()); AddAssert("Background retained from song select", () => songSelect.IsBackgroundCurrent());
AddStep("Trigger background preview when loaded", () => InputManager.MoveMouseTo(playerLoader.VisualSettingsPos));
AddWaitStep(1);
AddStep("Untrigger background preview", () => InputManager.MoveMouseTo(playerLoader.ScreenPos));
waitForDim(); waitForDim();
AddAssert("Screen is dimmed", () => songSelect.IsBackgroundDimmed()); AddAssert("Screen is dimmed", () => songSelect.IsBackgroundDimmed());
AddAssert("Screen is unblurred", () => songSelect.IsBackgroundUnblurred());
} }
/// <summary> /// <summary>
@ -252,7 +253,7 @@ namespace osu.Game.Tests.Visual
{ {
Size = new Vector2(250, 50), Size = new Vector2(250, 50),
Alpha = 1, Alpha = 1,
Colour = Color4.White, Colour = Color4.Tomato,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Text = "THIS IS A STORYBOARD", Text = "THIS IS A STORYBOARD",
@ -285,6 +286,7 @@ namespace osu.Game.Tests.Visual
{ {
Beatmap.Value.Mods.Value = Beatmap.Value.Mods.Value.Concat(new[] { new OsuModNoFail() }); Beatmap.Value.Mods.Value = Beatmap.Value.Mods.Value.Concat(new[] { new OsuModNoFail() });
songSelect.DimLevel.Value = 0.7f; songSelect.DimLevel.Value = 0.7f;
songSelect.BlurLevel.Value = 0.0f;
}); });
AddUntilStep(() => songSelect.Carousel.SelectedBeatmap != null, "Song select has selection"); AddUntilStep(() => songSelect.Carousel.SelectedBeatmap != null, "Song select has selection");
} }
@ -300,6 +302,7 @@ namespace osu.Game.Tests.Visual
public readonly Bindable<bool> DimEnabled = new Bindable<bool>(); public readonly Bindable<bool> DimEnabled = new Bindable<bool>();
public readonly Bindable<double> DimLevel = new Bindable<double>(); public readonly Bindable<double> DimLevel = new Bindable<double>();
public readonly Bindable<double> BlurLevel = new Bindable<double>();
public new BeatmapCarousel Carousel => base.Carousel; public new BeatmapCarousel Carousel => base.Carousel;
@ -307,11 +310,13 @@ namespace osu.Game.Tests.Visual
private void load(OsuConfigManager config) private void load(OsuConfigManager config)
{ {
config.BindWith(OsuSetting.DimLevel, DimLevel); config.BindWith(OsuSetting.DimLevel, DimLevel);
config.BindWith(OsuSetting.BlurLevel, BlurLevel);
} }
//public bool IsBackgroundDimmed() => ((FadeAccessibleBackground)Background).CurrentColour == OsuColour.Gray(1 - (float)DimLevel.Value);
public bool IsBackgroundDimmed() => ((FadeAccessibleBackground)Background).CurrentColour == OsuColour.Gray(1 - (float)DimLevel.Value); public bool IsBackgroundDimmed() => ((FadeAccessibleBackground)Background).CurrentColour == OsuColour.Gray(1 - (float)DimLevel.Value);
public bool IsBackgroundUnblurred() => ((FadeAccessibleBackground)Background).CurrentBlur == new Vector2(0);
public bool IsBackgroundUndimmed() => ((FadeAccessibleBackground)Background).CurrentColour == Color4.White; public bool IsBackgroundUndimmed() => ((FadeAccessibleBackground)Background).CurrentColour == Color4.White;
public bool IsBackgroundInvisible() => ((FadeAccessibleBackground)Background).CurrentAlpha == 0; public bool IsBackgroundInvisible() => ((FadeAccessibleBackground)Background).CurrentAlpha == 0;
@ -396,6 +401,11 @@ namespace osu.Game.Tests.Visual
{ {
} }
public void TriggerOnHover()
{
OnHover(new HoverEvent(new InputState()));
}
protected override BackgroundScreen CreateBackground() => new FadeAccessibleBackground(Beatmap.Value); protected override BackgroundScreen CreateBackground() => new FadeAccessibleBackground(Beatmap.Value);
} }
@ -406,6 +416,8 @@ namespace osu.Game.Tests.Visual
public Color4 CurrentColour => ((TestUserDimContainer)FadeContainer).CurrentColour; public Color4 CurrentColour => ((TestUserDimContainer)FadeContainer).CurrentColour;
public float CurrentAlpha => ((TestUserDimContainer)FadeContainer).CurrentAlpha; public float CurrentAlpha => ((TestUserDimContainer)FadeContainer).CurrentAlpha;
public Vector2 CurrentBlur => Background.BlurSigma;
public FadeAccessibleBackground(WorkingBeatmap beatmap) public FadeAccessibleBackground(WorkingBeatmap beatmap)
: base(beatmap) : base(beatmap)
{ {