h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-18 16:50:21 +08:00
Code Issues Releases Wiki Activity

Use switches for warmup/chat toggles in tournament interface

Browse Source 
As proposed in https://github.com/ppy/osu/discussions/32515.
This commit is contained in:
Dean Herbert
2025-08-29 14:35:42 +09:00
Unverified
parent 6e1316241a
commit 12832e9fef
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+12 -15
View File
@@ -7,7 +7,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Threading;
using osu.Game.Graphics.UserInterface;
using osu.Game.Graphics.UserInterfaceV2;
using osu.Game.Overlays.Settings;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.IPC;
@@ -24,7 +24,6 @@ namespace osu.Game.Tournament.Screens.Gameplay
private readonly BindableBool warmup = new BindableBool();
public readonly Bindable<TourneyState> State = new Bindable<TourneyState>();
private OsuButton warmupButton = null!;
private MatchIPCInfo ipc = null!;
[Resolved]
@@ -40,6 +39,8 @@ namespace osu.Game.Tournament.Screens.Gameplay
{
this.ipc = ipc;
LabelledSwitchButton chatToggle;
AddRangeInternal(new Drawable[]
{
new TourneyVideo("gameplay")
@@ -95,17 +96,14 @@ namespace osu.Game.Tournament.Screens.Gameplay
{
Children = new Drawable[]
{
warmupButton = new TourneyButton
new LabelledSwitchButton
{
RelativeSizeAxes = Axes.X,
Text = "Toggle warmup",
Action = () => warmup.Toggle()
Label = "Warmup",
Current = warmup,
},
new TourneyButton
chatToggle = new LabelledSwitchButton
{
RelativeSizeAxes = Axes.X,
Text = "Toggle chat",
Action = () => { State.Value = State.Value == TourneyState.Idle ? TourneyState.Playing : TourneyState.Idle; }
Label = "Show chat",
},
new SettingsSlider<int>
{
@@ -123,13 +121,12 @@ namespace osu.Game.Tournament.Screens.Gameplay
}
});
State.BindValueChanged(state => chatToggle.Current.Value = State.Value == TourneyState.Idle, true);
chatToggle.Current.BindValueChanged(v => State.Value = v.NewValue ? TourneyState.Idle : TourneyState.Playing);
LadderInfo.ChromaKeyWidth.BindValueChanged(width => chroma.Width = width.NewValue, true);
warmup.BindValueChanged(w =>
{
warmupButton.Alpha = !w.NewValue ? 0.5f : 1;
header.ShowScores = !w.NewValue;
}, true);
warmup.BindValueChanged(w => header.ShowScores = !w.NewValue, true);
}
protected override void LoadComplete()