mirror of
https://github.com/ppy/osu.git
synced 2025-03-28 20:47:22 +08:00
add dialogoverlay to tournament client, confirmation dialog for resetting bracket teams
This commit is contained in:
parent
c77d3cd6bd
commit
2833497e5b
34
osu.Game.Tournament/Screens/BracketResetTeamsDialog.cs
Normal file
34
osu.Game.Tournament/Screens/BracketResetTeamsDialog.cs
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
// 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.
|
||||||
|
|
||||||
|
using osu.Framework.Allocation;
|
||||||
|
using osu.Framework.Graphics.Containers;
|
||||||
|
using osu.Framework.Graphics.Sprites;
|
||||||
|
using osu.Game.Overlays.Dialog;
|
||||||
|
using osu.Game.Tournament.Screens.Ladder.Components;
|
||||||
|
|
||||||
|
namespace osu.Game.Tournament.Screens
|
||||||
|
{
|
||||||
|
public partial class BracketResetTeamsDialog : DangerousActionDialog
|
||||||
|
{
|
||||||
|
private readonly Container<DrawableTournamentMatch> matchesContainer;
|
||||||
|
|
||||||
|
public BracketResetTeamsDialog(Container<DrawableTournamentMatch> matchesContainer)
|
||||||
|
{
|
||||||
|
this.matchesContainer = matchesContainer;
|
||||||
|
BodyText = @"";
|
||||||
|
HeaderText = @"Confirm reset teams?";
|
||||||
|
Icon = FontAwesome.Solid.Undo;
|
||||||
|
}
|
||||||
|
|
||||||
|
[BackgroundDependencyLoader]
|
||||||
|
private void load()
|
||||||
|
{
|
||||||
|
DangerousAction = () =>
|
||||||
|
{
|
||||||
|
foreach (var p in matchesContainer)
|
||||||
|
p.Match.Reset();
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -6,6 +6,7 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using JetBrains.Annotations;
|
||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Framework.Graphics.Containers;
|
using osu.Framework.Graphics.Containers;
|
||||||
@ -13,8 +14,10 @@ using osu.Framework.Graphics.Cursor;
|
|||||||
using osu.Framework.Graphics.UserInterface;
|
using osu.Framework.Graphics.UserInterface;
|
||||||
using osu.Framework.Input.Events;
|
using osu.Framework.Input.Events;
|
||||||
using osu.Framework.Input.States;
|
using osu.Framework.Input.States;
|
||||||
|
using osu.Framework.Logging;
|
||||||
using osu.Game.Graphics.UserInterface;
|
using osu.Game.Graphics.UserInterface;
|
||||||
using osu.Game.Tournament.Components;
|
using osu.Game.Tournament.Components;
|
||||||
|
using osu.Game.Overlays;
|
||||||
using osu.Game.Tournament.Models;
|
using osu.Game.Tournament.Models;
|
||||||
using osu.Game.Tournament.Screens.Ladder;
|
using osu.Game.Tournament.Screens.Ladder;
|
||||||
using osu.Game.Tournament.Screens.Ladder.Components;
|
using osu.Game.Tournament.Screens.Ladder.Components;
|
||||||
@ -31,6 +34,10 @@ namespace osu.Game.Tournament.Screens.Editors
|
|||||||
|
|
||||||
private WarningBox rightClickMessage;
|
private WarningBox rightClickMessage;
|
||||||
|
|
||||||
|
[Resolved]
|
||||||
|
[CanBeNull]
|
||||||
|
private IDialogOverlay dialogOverlay { get; set; }
|
||||||
|
|
||||||
protected override bool DrawLoserPaths => true;
|
protected override bool DrawLoserPaths => true;
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
@ -73,8 +80,7 @@ namespace osu.Game.Tournament.Screens.Editors
|
|||||||
}),
|
}),
|
||||||
new OsuMenuItem("Reset teams", MenuItemType.Destructive, () =>
|
new OsuMenuItem("Reset teams", MenuItemType.Destructive, () =>
|
||||||
{
|
{
|
||||||
foreach (var p in MatchesContainer)
|
dialogOverlay?.Push(new BracketResetTeamsDialog(MatchesContainer));
|
||||||
p.Match.Reset();
|
|
||||||
})
|
})
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -6,12 +6,14 @@
|
|||||||
using System.Collections.Specialized;
|
using System.Collections.Specialized;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using JetBrains.Annotations;
|
||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
using osu.Framework.Caching;
|
using osu.Framework.Caching;
|
||||||
using osu.Framework.Extensions.Color4Extensions;
|
using osu.Framework.Extensions.Color4Extensions;
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Framework.Graphics.Containers;
|
using osu.Framework.Graphics.Containers;
|
||||||
using osu.Framework.Graphics.Lines;
|
using osu.Framework.Graphics.Lines;
|
||||||
|
using osu.Game.Overlays;
|
||||||
using osu.Game.Tournament.Components;
|
using osu.Game.Tournament.Components;
|
||||||
using osu.Game.Tournament.Models;
|
using osu.Game.Tournament.Models;
|
||||||
using osu.Game.Tournament.Screens.Editors;
|
using osu.Game.Tournament.Screens.Editors;
|
||||||
|
@ -11,12 +11,14 @@ using osu.Framework.Configuration;
|
|||||||
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;
|
||||||
|
using osu.Framework.Graphics.Containers;
|
||||||
using osu.Framework.Input.Handlers.Mouse;
|
using osu.Framework.Input.Handlers.Mouse;
|
||||||
using osu.Framework.Logging;
|
using osu.Framework.Logging;
|
||||||
using osu.Framework.Platform;
|
using osu.Framework.Platform;
|
||||||
using osu.Game.Graphics;
|
using osu.Game.Graphics;
|
||||||
using osu.Game.Graphics.Cursor;
|
using osu.Game.Graphics.Cursor;
|
||||||
using osu.Game.Graphics.UserInterface;
|
using osu.Game.Graphics.UserInterface;
|
||||||
|
using osu.Game.Overlays;
|
||||||
using osu.Game.Tournament.Models;
|
using osu.Game.Tournament.Models;
|
||||||
using osuTK.Graphics;
|
using osuTK.Graphics;
|
||||||
|
|
||||||
@ -39,6 +41,13 @@ namespace osu.Game.Tournament
|
|||||||
private Bindable<WindowMode> windowMode;
|
private Bindable<WindowMode> windowMode;
|
||||||
private LoadingSpinner loadingSpinner;
|
private LoadingSpinner loadingSpinner;
|
||||||
|
|
||||||
|
private readonly DialogOverlay dialogOverlay = new DialogOverlay();
|
||||||
|
private DependencyContainer dependencies;
|
||||||
|
private Container topMostOverlayContent;
|
||||||
|
|
||||||
|
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
|
||||||
|
dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
private void load(FrameworkConfigManager frameworkConfig, GameHost host)
|
private void load(FrameworkConfigManager frameworkConfig, GameHost host)
|
||||||
{
|
{
|
||||||
@ -52,6 +61,8 @@ namespace osu.Game.Tournament
|
|||||||
Margin = new MarginPadding(40),
|
Margin = new MarginPadding(40),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
dependencies.CacheAs<IDialogOverlay>(dialogOverlay);
|
||||||
|
|
||||||
// in order to have the OS mouse cursor visible, relative mode needs to be disabled.
|
// in order to have the OS mouse cursor visible, relative mode needs to be disabled.
|
||||||
// can potentially be removed when https://github.com/ppy/osu-framework/issues/4309 is resolved.
|
// can potentially be removed when https://github.com/ppy/osu-framework/issues/4309 is resolved.
|
||||||
var mouseHandler = host.AvailableInputHandlers.OfType<MouseHandler>().FirstOrDefault();
|
var mouseHandler = host.AvailableInputHandlers.OfType<MouseHandler>().FirstOrDefault();
|
||||||
@ -90,12 +101,14 @@ namespace osu.Game.Tournament
|
|||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.Both,
|
RelativeSizeAxes = Axes.Both,
|
||||||
Child = new TournamentSceneManager()
|
Child = new TournamentSceneManager()
|
||||||
}
|
},
|
||||||
|
topMostOverlayContent = new Container { RelativeSizeAxes = Axes.Both }
|
||||||
}, drawables =>
|
}, drawables =>
|
||||||
{
|
{
|
||||||
loadingSpinner.Hide();
|
loadingSpinner.Hide();
|
||||||
loadingSpinner.Expire();
|
loadingSpinner.Expire();
|
||||||
|
|
||||||
|
topMostOverlayContent.Add(dialogOverlay);
|
||||||
AddRange(drawables);
|
AddRange(drawables);
|
||||||
|
|
||||||
windowSize.BindValueChanged(size => ScheduleAfterChildren(() =>
|
windowSize.BindValueChanged(size => ScheduleAfterChildren(() =>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user