From cdf9ea0d01ddcf43d4728c10dd114faeedd483a0 Mon Sep 17 00:00:00 2001 From: Aergwyn Date: Sat, 9 Dec 2017 13:39:11 +0100 Subject: [PATCH] removed unnecessary variable and fixed the test because of new DI letting it fail --- osu.Game.Tests/Visual/TestCaseSettings.cs | 24 +++++++++++++++---- .../Sections/Maintenance/GeneralSettings.cs | 6 +---- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/osu.Game.Tests/Visual/TestCaseSettings.cs b/osu.Game.Tests/Visual/TestCaseSettings.cs index 63d798cd53..d7855a22bf 100644 --- a/osu.Game.Tests/Visual/TestCaseSettings.cs +++ b/osu.Game.Tests/Visual/TestCaseSettings.cs @@ -1,6 +1,8 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +using osu.Framework.Allocation; +using osu.Framework.Graphics.Containers; using osu.Game.Overlays; namespace osu.Game.Tests.Visual @@ -8,16 +10,30 @@ namespace osu.Game.Tests.Visual internal class TestCaseSettings : OsuTestCase { private readonly SettingsOverlay settings; + private readonly DialogOverlay dialogOverlay; + + private DependencyContainer dependencies; + + protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent) => dependencies = new DependencyContainer(parent); public TestCaseSettings() { - Children = new[] { settings = new MainSettings() }; + settings = new MainSettings + { + State = Visibility.Visible + }; + Add(dialogOverlay = new DialogOverlay + { + Depth = -1 + }); } - protected override void LoadComplete() + [BackgroundDependencyLoader] + private void load() { - base.LoadComplete(); - settings.ToggleVisibility(); + dependencies.Cache(dialogOverlay); + + Add(settings); } } } diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs index 18776b4c4c..66be5bc0ac 100644 --- a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs +++ b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs @@ -17,15 +17,11 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance private TriangleButton deleteButton; private TriangleButton restoreButton; - private DialogOverlay dialogOverlay; - protected override string Header => "General"; [BackgroundDependencyLoader] - private void load(BeatmapManager beatmaps, DialogOverlay dialog) + private void load(BeatmapManager beatmaps, DialogOverlay dialogOverlay) { - dialogOverlay = dialog; - Children = new Drawable[] { importButton = new SettingsButton