RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjust styling of disabled settings

This commit is contained in:
smoogipoo 2018-12-22 15:00:35 +09:00
parent 34fc740e1f
commit 6afd2f7263
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs
View File

@ -1,6 +1,8 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Collections.Generic;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Online.Multiplayer;
@ -10,6 +12,11 @@ namespace osu.Game.Tests.Visual
{
public class TestCaseMatchSettingsOverlay : OsuTestCase
{
public override IReadOnlyList<Type> RequiredTypes => new[]
{
typeof(RoomSettingsOverlay)
};
public TestCaseMatchSettingsOverlay()
{
Child = new RoomSettingsOverlay(new Room())

15
osu.Game/Screens/Multi/Components/DisableableTabControl.cs
View File

@ -4,39 +4,32 @@
using osu.Framework.Configuration;
using osu.Framework.Graphics.UserInterface;
using osu.Framework.Input.Events;
using osuTK.Graphics;
namespace osu.Game.Screens.Multi.Components
{
public abstract class DisableableTabControl<T> : TabControl<T>
{
public readonly BindableBool ReadOnly = new BindableBool();
public readonly BindableBool Enabled = new BindableBool();
protected override void AddTabItem(TabItem<T> tab, bool addToDropdown = true)
{
if (tab is DisableableTabItem<T> disableable)
disableable.ReadOnly.BindTo(ReadOnly);
disableable.Enabled.BindTo(Enabled);
base.AddTabItem(tab, addToDropdown);
}
protected abstract class DisableableTabItem<T> : TabItem<T>
{
public readonly BindableBool ReadOnly = new BindableBool();
public readonly BindableBool Enabled = new BindableBool();
protected DisableableTabItem(T value)
: base(value)
{
ReadOnly.BindValueChanged(updateReadOnly);
}
private void updateReadOnly(bool readOnly)
{
Colour = readOnly ? Color4.Gray : Color4.White;
}
protected override bool OnClick(ClickEvent e)
{
if (ReadOnly)
if (!Enabled)
return true;
return base.OnClick(e);
}

9
osu.Game/Screens/Multi/Match/Components/RoomSettingsOverlay.cs
View File

@ -22,6 +22,7 @@ public class RoomSettingsOverlay : FocusedOverlayContainer
{
private const float transition_duration = 350;
private const float field_padding = 45;
private const float disabled_alpha = 0.2f;
private readonly RoomBindings bindings = new RoomBindings();
@ -82,10 +83,12 @@ public RoomSettingsOverlay(Room room)
},
new Section("ROOM VISIBILITY")
{
Alpha = disabled_alpha,
Child = AvailabilityPicker = new RoomAvailabilityPicker(),
},
new Section("GAME TYPE")
{
Alpha = disabled_alpha,
Child = new FillFlowContainer
{
AutoSizeAxes = Axes.Y,
@ -116,6 +119,7 @@ public RoomSettingsOverlay(Room room)
{
new Section("MAX PARTICIPANTS")
{
Alpha = disabled_alpha,
Child = MaxParticipantsField = new SettingsNumberTextBox
{
RelativeSizeAxes = Axes.X,
@ -146,6 +150,7 @@ public RoomSettingsOverlay(Room room)
},
new Section("PASSWORD (OPTIONAL)")
{
Alpha = disabled_alpha,
Child = PasswordField = new SettingsPasswordTextBox
{
RelativeSizeAxes = Axes.X,
@ -199,8 +204,8 @@ private void load(OsuColour colours)
MaxParticipantsField.ReadOnly = true;
PasswordField.ReadOnly = true;
AvailabilityPicker.ReadOnly.Value = true;
TypePicker.ReadOnly.Value = true;
AvailabilityPicker.Enabled.Value = false;
TypePicker.Enabled.Value = false;
ApplyButton.Enabled.Value = false;
}