From 333c0cd4f9c717187cc8a15f6ba93207a02ffbbf Mon Sep 17 00:00:00 2001 From: Shivam Date: Fri, 25 Feb 2022 14:16:18 +0100 Subject: [PATCH 1/2] Add open folder button to open currently selected tournament --- osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs index 74c872646c..2134dbf9d3 100644 --- a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs +++ b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs @@ -11,6 +11,7 @@ namespace osu.Game.Tournament.Screens.Setup internal class TournamentSwitcher : ActionableInfo { private OsuDropdown dropdown; + private OsuButton folderButton; [Resolved] private TournamentGameBase game { get; set; } @@ -25,6 +26,7 @@ namespace osu.Game.Tournament.Screens.Setup dropdown.Current.BindValueChanged(v => Button.Enabled.Value = v.NewValue != startupTournament, true); Action = () => game.GracefullyExit(); + folderButton.Action = storage.PresentExternally; ButtonText = "Close osu!"; } @@ -38,6 +40,12 @@ namespace osu.Game.Tournament.Screens.Setup Width = 510 }); + FlowContainer.Insert(-2, folderButton = new TriangleButton + { + Text = "Open folder", + Width = 100 + }); + return drawable; } } From 4c564581739a13e1de73ef75054bd7c825dca384 Mon Sep 17 00:00:00 2001 From: Shivam Date: Fri, 25 Feb 2022 15:13:32 +0100 Subject: [PATCH 2/2] Change button location to the right side of dropdown --- .../Screens/Setup/TournamentSwitcher.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs index 2134dbf9d3..93cfa9634e 100644 --- a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs +++ b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs @@ -35,17 +35,17 @@ namespace osu.Game.Tournament.Screens.Setup { var drawable = base.CreateComponent(); - FlowContainer.Insert(-1, dropdown = new OsuDropdown - { - Width = 510 - }); - - FlowContainer.Insert(-2, folderButton = new TriangleButton + FlowContainer.Insert(-1, folderButton = new TriangleButton { Text = "Open folder", Width = 100 }); + FlowContainer.Insert(-2, dropdown = new OsuDropdown + { + Width = 510 + }); + return drawable; } }