From 408173319bd36c931225ac29cdc9ab7f2a9af5eb Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Thu, 3 Nov 2016 23:01:11 -0400 Subject: [PATCH] Refactor options header and layout stuff --- .../Overlays/Options/AlertsPrivacyOptions.cs | 3 +- .../Overlays/Options/AudioDevicesOptions.cs | 3 +- osu.Game/Overlays/Options/AudioOptions.cs | 3 +- osu.Game/Overlays/Options/DetailOptions.cs | 3 +- osu.Game/Overlays/Options/EditorOptions.cs | 24 +++---- osu.Game/Overlays/Options/GameplayOptions.cs | 3 +- .../Options/GeneralGameplayOptions.cs | 3 +- osu.Game/Overlays/Options/GeneralOptions.cs | 3 +- osu.Game/Overlays/Options/GraphicsOptions.cs | 3 +- .../Overlays/Options/InGameChatOptions.cs | 3 +- osu.Game/Overlays/Options/InputOptions.cs | 3 +- osu.Game/Overlays/Options/KeyboardOptions.cs | 3 +- osu.Game/Overlays/Options/LanguageOptions.cs | 3 +- osu.Game/Overlays/Options/LayoutOptions.cs | 3 +- osu.Game/Overlays/Options/LoginOptions.cs | 2 +- osu.Game/Overlays/Options/MainMenuOptions.cs | 3 +- .../Overlays/Options/MaintenanceOptions.cs | 62 +++++++++---------- osu.Game/Overlays/Options/MouseOptions.cs | 3 +- .../Options/OffsetAdjustmentOptions.cs | 3 +- .../Options/OnlineIntegrationOptions.cs | 3 +- osu.Game/Overlays/Options/OnlineOptions.cs | 3 +- osu.Game/Overlays/Options/OptionsSection.cs | 16 ++--- .../Overlays/Options/OptionsSubsection.cs | 12 ++-- .../Overlays/Options/OtherInputOptions.cs | 3 +- osu.Game/Overlays/Options/RendererOptions.cs | 3 +- osu.Game/Overlays/Options/SkinOptions.cs | 56 ++++++++--------- .../Options/SongSelectGameplayOptions.cs | 3 +- .../Options/SongSelectGraphicsOptions.cs | 3 +- osu.Game/Overlays/Options/UpdateOptions.cs | 2 +- osu.Game/Overlays/Options/VolumeOptions.cs | 3 +- 30 files changed, 122 insertions(+), 121 deletions(-) diff --git a/osu.Game/Overlays/Options/AlertsPrivacyOptions.cs b/osu.Game/Overlays/Options/AlertsPrivacyOptions.cs index 1448a60732..61dec55107 100644 --- a/osu.Game/Overlays/Options/AlertsPrivacyOptions.cs +++ b/osu.Game/Overlays/Options/AlertsPrivacyOptions.cs @@ -6,10 +6,11 @@ namespace osu.Game.Overlays.Options { public class AlertsPrivacyOptions : OptionsSubsection { + protected override string Header => "Alerts & Privacy"; + public AlertsPrivacyOptions() { // TODO: this should probably be split into Alerts and Privacy - Header = "Alerts & Privacy"; Children = new Drawable[] { new BasicCheckBox { LabelText = "Chat ticker" }, diff --git a/osu.Game/Overlays/Options/AudioDevicesOptions.cs b/osu.Game/Overlays/Options/AudioDevicesOptions.cs index 4f43bffb24..99636fe4f5 100644 --- a/osu.Game/Overlays/Options/AudioDevicesOptions.cs +++ b/osu.Game/Overlays/Options/AudioDevicesOptions.cs @@ -5,9 +5,10 @@ namespace osu.Game.Overlays.Options { public class AudioDevicesOptions : OptionsSubsection { + protected override string Header => "Devices"; + public AudioDevicesOptions() { - Header = "Devices"; Children = new[] { new SpriteText { Text = "Output device: TODO dropdown" } diff --git a/osu.Game/Overlays/Options/AudioOptions.cs b/osu.Game/Overlays/Options/AudioOptions.cs index 3c348d1342..f0d2eeebd0 100644 --- a/osu.Game/Overlays/Options/AudioOptions.cs +++ b/osu.Game/Overlays/Options/AudioOptions.cs @@ -5,9 +5,10 @@ namespace osu.Game.Overlays.Options { public class AudioOptions : OptionsSection { + protected override string Header => "Audio"; + public AudioOptions() { - Header = "Audio"; Children = new Drawable[] { new AudioDevicesOptions(), diff --git a/osu.Game/Overlays/Options/DetailOptions.cs b/osu.Game/Overlays/Options/DetailOptions.cs index 4ef89a3b96..482b9c86cd 100644 --- a/osu.Game/Overlays/Options/DetailOptions.cs +++ b/osu.Game/Overlays/Options/DetailOptions.cs @@ -7,9 +7,10 @@ namespace osu.Game.Overlays.Options { public class DetailOptions : OptionsSubsection { + protected override string Header => "Detail Settings"; + public DetailOptions() { - Header = "Detail Settings"; Children = new Drawable[] { new BasicCheckBox { LabelText = "Snaking sliders" }, diff --git a/osu.Game/Overlays/Options/EditorOptions.cs b/osu.Game/Overlays/Options/EditorOptions.cs index 3d1b18cbd0..2b3f1a9743 100644 --- a/osu.Game/Overlays/Options/EditorOptions.cs +++ b/osu.Game/Overlays/Options/EditorOptions.cs @@ -1,4 +1,5 @@ using System; +using OpenTK; using osu.Framework.Graphics; using osu.Framework.Graphics.UserInterface; @@ -6,24 +7,19 @@ namespace osu.Game.Overlays.Options { public class EditorOptions : OptionsSection { + protected override string Header => "Editor"; + public EditorOptions() { - Header = "Editor"; + content.Spacing = new Vector2(0, 5); Children = new Drawable[] { - new OptionsSubsection - { - Header = "General", - Children = new Drawable[] - { - new BasicCheckBox { LabelText = "Background video" }, - new BasicCheckBox { LabelText = "Always use default skin" }, - new BasicCheckBox { LabelText = "Snaking sliders" }, - new BasicCheckBox { LabelText = "Hit animations" }, - new BasicCheckBox { LabelText = "Follow points" }, - new BasicCheckBox { LabelText = "Stacking" }, - } - } + new BasicCheckBox { LabelText = "Background video" }, + new BasicCheckBox { LabelText = "Always use default skin" }, + new BasicCheckBox { LabelText = "Snaking sliders" }, + new BasicCheckBox { LabelText = "Hit animations" }, + new BasicCheckBox { LabelText = "Follow points" }, + new BasicCheckBox { LabelText = "Stacking" }, }; } } diff --git a/osu.Game/Overlays/Options/GameplayOptions.cs b/osu.Game/Overlays/Options/GameplayOptions.cs index 23d4a4b3d7..41f811708a 100644 --- a/osu.Game/Overlays/Options/GameplayOptions.cs +++ b/osu.Game/Overlays/Options/GameplayOptions.cs @@ -5,9 +5,10 @@ namespace osu.Game.Overlays.Options { public class GameplayOptions : OptionsSection { + protected override string Header => "Gameplay"; + public GameplayOptions() { - Header = "Gameplay"; Children = new Drawable[] { new GeneralGameplayOptions(), diff --git a/osu.Game/Overlays/Options/GeneralGameplayOptions.cs b/osu.Game/Overlays/Options/GeneralGameplayOptions.cs index 7755f38536..920c8b3a49 100644 --- a/osu.Game/Overlays/Options/GeneralGameplayOptions.cs +++ b/osu.Game/Overlays/Options/GeneralGameplayOptions.cs @@ -7,9 +7,10 @@ namespace osu.Game.Overlays.Options { public class GeneralGameplayOptions : OptionsSubsection { + protected override string Header => "General"; + public GeneralGameplayOptions() { - Header = "General"; Children = new Drawable[] { new SpriteText { Text = "Background dim: TODO slider" }, diff --git a/osu.Game/Overlays/Options/GeneralOptions.cs b/osu.Game/Overlays/Options/GeneralOptions.cs index 278231fa5a..46adbe53d6 100644 --- a/osu.Game/Overlays/Options/GeneralOptions.cs +++ b/osu.Game/Overlays/Options/GeneralOptions.cs @@ -10,9 +10,10 @@ namespace osu.Game.Overlays.Options { public class GeneralOptions : OptionsSection { + protected override string Header => "General"; + public GeneralOptions() { - Header = "General"; Children = new Drawable[] { new LoginOptions(), diff --git a/osu.Game/Overlays/Options/GraphicsOptions.cs b/osu.Game/Overlays/Options/GraphicsOptions.cs index b855f07a1d..8051a815aa 100644 --- a/osu.Game/Overlays/Options/GraphicsOptions.cs +++ b/osu.Game/Overlays/Options/GraphicsOptions.cs @@ -5,9 +5,10 @@ namespace osu.Game.Overlays.Options { public class GraphicsOptions : OptionsSection { + protected override string Header => "Graphics"; + public GraphicsOptions() { - Header = "Graphics"; Children = new Drawable[] { new RendererOptions(), diff --git a/osu.Game/Overlays/Options/InGameChatOptions.cs b/osu.Game/Overlays/Options/InGameChatOptions.cs index 34d34c64a6..32ca68758b 100644 --- a/osu.Game/Overlays/Options/InGameChatOptions.cs +++ b/osu.Game/Overlays/Options/InGameChatOptions.cs @@ -7,9 +7,10 @@ namespace osu.Game.Overlays.Options { public class InGameChatOptions : OptionsSubsection { + protected override string Header => "In-game Chat"; + public InGameChatOptions() { - Header = "In-game Chat"; Children = new Drawable[] { new BasicCheckBox { LabelText = "Filter offensive words" }, diff --git a/osu.Game/Overlays/Options/InputOptions.cs b/osu.Game/Overlays/Options/InputOptions.cs index 0886ab6610..189beb86c9 100644 --- a/osu.Game/Overlays/Options/InputOptions.cs +++ b/osu.Game/Overlays/Options/InputOptions.cs @@ -5,9 +5,10 @@ namespace osu.Game.Overlays.Options { public class InputOptions : OptionsSection { + protected override string Header => "Input"; + public InputOptions() { - Header = "Input"; Children = new Drawable[] { new MouseOptions(), diff --git a/osu.Game/Overlays/Options/KeyboardOptions.cs b/osu.Game/Overlays/Options/KeyboardOptions.cs index 16c3b54cd6..fbcc97bebb 100644 --- a/osu.Game/Overlays/Options/KeyboardOptions.cs +++ b/osu.Game/Overlays/Options/KeyboardOptions.cs @@ -6,9 +6,10 @@ namespace osu.Game.Overlays.Options { public class KeyboardOptions : OptionsSubsection { + protected override string Header => "Keyboard"; + public KeyboardOptions() { - Header = "Keyboard"; Children = new Drawable[] { new OsuButton diff --git a/osu.Game/Overlays/Options/LanguageOptions.cs b/osu.Game/Overlays/Options/LanguageOptions.cs index 02496b69b1..c5363c3457 100644 --- a/osu.Game/Overlays/Options/LanguageOptions.cs +++ b/osu.Game/Overlays/Options/LanguageOptions.cs @@ -7,9 +7,10 @@ namespace osu.Game.Overlays.Options { public class LanguageOptions : OptionsSubsection { + protected override string Header => "Language"; + public LanguageOptions() { - Header = "Language"; Children = new Drawable[] { new SpriteText { Text = "TODO: Dropdown" }, diff --git a/osu.Game/Overlays/Options/LayoutOptions.cs b/osu.Game/Overlays/Options/LayoutOptions.cs index 80843bde3c..1d0d503549 100644 --- a/osu.Game/Overlays/Options/LayoutOptions.cs +++ b/osu.Game/Overlays/Options/LayoutOptions.cs @@ -7,9 +7,10 @@ namespace osu.Game.Overlays.Options { public class LayoutOptions : OptionsSubsection { + protected override string Header => "Layout"; + public LayoutOptions() { - Header = "Layout"; Children = new Drawable[] { new SpriteText { Text = "Resolution: TODO dropdown" }, diff --git a/osu.Game/Overlays/Options/LoginOptions.cs b/osu.Game/Overlays/Options/LoginOptions.cs index 942ac34ff3..a6ae1775cd 100644 --- a/osu.Game/Overlays/Options/LoginOptions.cs +++ b/osu.Game/Overlays/Options/LoginOptions.cs @@ -14,10 +14,10 @@ namespace osu.Game.Overlays.Options public class LoginOptions : OptionsSubsection { private Container loginForm; + protected override string Header => "Sign In"; public LoginOptions() { - Header = "Sign In"; Children = new[] { loginForm = new Container diff --git a/osu.Game/Overlays/Options/MainMenuOptions.cs b/osu.Game/Overlays/Options/MainMenuOptions.cs index c51b298064..6b575431f7 100644 --- a/osu.Game/Overlays/Options/MainMenuOptions.cs +++ b/osu.Game/Overlays/Options/MainMenuOptions.cs @@ -5,9 +5,10 @@ namespace osu.Game.Overlays.Options { public class MainMenuOptions : OptionsSubsection { + protected override string Header => "Main Menu"; + public MainMenuOptions() { - Header = "Main Menu"; Children = new[] { new BasicCheckBox { LabelText = "Snow" }, diff --git a/osu.Game/Overlays/Options/MaintenanceOptions.cs b/osu.Game/Overlays/Options/MaintenanceOptions.cs index 3f6cad995f..c139804f4c 100644 --- a/osu.Game/Overlays/Options/MaintenanceOptions.cs +++ b/osu.Game/Overlays/Options/MaintenanceOptions.cs @@ -1,4 +1,5 @@ using System; +using OpenTK; using osu.Framework.Graphics; using osu.Framework.Graphics.Sprites; using osu.Game.Graphics.UserInterface; @@ -7,44 +8,39 @@ namespace osu.Game.Overlays.Options { public class MaintenanceOptions : OptionsSection { + protected override string Header => "Maintenance"; + public MaintenanceOptions() { - Header = "Maintenance"; + content.Spacing = new Vector2(0, 5); Children = new Drawable[] { - new OptionsSubsection + new OsuButton { - Header = "General", - Children = new Drawable[] - { - new OsuButton - { - RelativeSizeAxes = Axes.X, - Text = "Delete all unranked maps", - }, - new OsuButton - { - RelativeSizeAxes = Axes.X, - Text = "Repair folder permissions", - }, - new OsuButton - { - RelativeSizeAxes = Axes.X, - Text = "Mark all maps as played", - }, - new OsuButton - { - RelativeSizeAxes = Axes.X, - Text = "Run osu! updater", - }, - new SpriteText - { - Text = "TODO: osu version here", - Anchor = Anchor.TopCentre, - Origin = Anchor.TopCentre, - }, - } - } + RelativeSizeAxes = Axes.X, + Text = "Delete all unranked maps", + }, + new OsuButton + { + RelativeSizeAxes = Axes.X, + Text = "Repair folder permissions", + }, + new OsuButton + { + RelativeSizeAxes = Axes.X, + Text = "Mark all maps as played", + }, + new OsuButton + { + RelativeSizeAxes = Axes.X, + Text = "Run osu! updater", + }, + new SpriteText + { + Text = "TODO: osu version here", + Anchor = Anchor.TopCentre, + Origin = Anchor.TopCentre, + }, }; } } diff --git a/osu.Game/Overlays/Options/MouseOptions.cs b/osu.Game/Overlays/Options/MouseOptions.cs index c82d734440..a6236d515d 100644 --- a/osu.Game/Overlays/Options/MouseOptions.cs +++ b/osu.Game/Overlays/Options/MouseOptions.cs @@ -7,9 +7,10 @@ namespace osu.Game.Overlays.Options { public class MouseOptions : OptionsSubsection { + protected override string Header => "Mouse"; + public MouseOptions() { - Header = "Mouse"; Children = new Drawable[] { new SpriteText { Text = "Sensitivity: TODO slider" }, diff --git a/osu.Game/Overlays/Options/OffsetAdjustmentOptions.cs b/osu.Game/Overlays/Options/OffsetAdjustmentOptions.cs index 79fc48c46a..62e124fa4f 100644 --- a/osu.Game/Overlays/Options/OffsetAdjustmentOptions.cs +++ b/osu.Game/Overlays/Options/OffsetAdjustmentOptions.cs @@ -7,9 +7,10 @@ namespace osu.Game.Overlays.Options { public class OffsetAdjustmentOptions : OptionsSubsection { + protected override string Header => "Offset Adjustment"; + public OffsetAdjustmentOptions() { - Header = "Offset Adjustment"; Children = new Drawable[] { new SpriteText { Text = "Universal Offset: TODO slider" }, diff --git a/osu.Game/Overlays/Options/OnlineIntegrationOptions.cs b/osu.Game/Overlays/Options/OnlineIntegrationOptions.cs index e08161f8f1..2fe2bb2e70 100644 --- a/osu.Game/Overlays/Options/OnlineIntegrationOptions.cs +++ b/osu.Game/Overlays/Options/OnlineIntegrationOptions.cs @@ -6,9 +6,10 @@ namespace osu.Game.Overlays.Options { public class OnlineIntegrationOptions : OptionsSubsection { + protected override string Header => "Integration"; + public OnlineIntegrationOptions() { - Header = "Integration"; Children = new Drawable[] { new BasicCheckBox { LabelText = "Integrate with Yahoo! status display" }, diff --git a/osu.Game/Overlays/Options/OnlineOptions.cs b/osu.Game/Overlays/Options/OnlineOptions.cs index 88c9b0e68e..a22d416ab5 100644 --- a/osu.Game/Overlays/Options/OnlineOptions.cs +++ b/osu.Game/Overlays/Options/OnlineOptions.cs @@ -5,9 +5,10 @@ namespace osu.Game.Overlays.Options { public class OnlineOptions : OptionsSection { + protected override string Header => "Online"; + public OnlineOptions() { - Header = "Online"; Children = new Drawable[] { new AlertsPrivacyOptions(), diff --git a/osu.Game/Overlays/Options/OptionsSection.cs b/osu.Game/Overlays/Options/OptionsSection.cs index 9ef93a3d01..79776cc800 100644 --- a/osu.Game/Overlays/Options/OptionsSection.cs +++ b/osu.Game/Overlays/Options/OptionsSection.cs @@ -8,19 +8,12 @@ using osu.Framework.Graphics.Sprites; namespace osu.Game.Overlays.Options { - public class OptionsSection : Container + public abstract class OptionsSection : Container { - private SpriteText header; - private FlowContainer content; + protected FlowContainer content; protected override Container Content => content; - - public string Header - { - get { return header.Text; } - set { header.Text = value; } - } - + protected abstract string Header { get; } public OptionsSection() { @@ -49,10 +42,11 @@ namespace osu.Game.Overlays.Options AutoSizeAxes = Axes.Y, Children = new[] { - header = new SpriteText + new SpriteText { TextSize = headerSize, Colour = new Color4(247, 198, 35, 255), + Text = Header, }, content = new FlowContainer { diff --git a/osu.Game/Overlays/Options/OptionsSubsection.cs b/osu.Game/Overlays/Options/OptionsSubsection.cs index bb41f73428..ed3a6a0ca7 100644 --- a/osu.Game/Overlays/Options/OptionsSubsection.cs +++ b/osu.Game/Overlays/Options/OptionsSubsection.cs @@ -6,17 +6,12 @@ using osu.Framework.Graphics.Sprites; namespace osu.Game.Overlays.Options { - public class OptionsSubsection : Container + public abstract class OptionsSubsection : Container { - private SpriteText header; private Container content; protected override Container Content => content; - public string Header - { - get { return header.Text; } - set { header.Text = value.ToUpper(); } - } + protected abstract string Header { get; } public OptionsSubsection() { @@ -32,9 +27,10 @@ namespace osu.Game.Overlays.Options Spacing = new Vector2(0, 5), Children = new[] { - header = new SpriteText + new SpriteText { TextSize = 25, + Text = Header, // TODO: Bold } } diff --git a/osu.Game/Overlays/Options/OtherInputOptions.cs b/osu.Game/Overlays/Options/OtherInputOptions.cs index e4383ee523..c91dc82e20 100644 --- a/osu.Game/Overlays/Options/OtherInputOptions.cs +++ b/osu.Game/Overlays/Options/OtherInputOptions.cs @@ -6,9 +6,10 @@ namespace osu.Game.Overlays.Options { public class OtherInputOptions : OptionsSubsection { + protected override string Header => "Other"; + public OtherInputOptions() { - Header = "Other"; Children = new Drawable[] { new BasicCheckBox { LabelText = "OS TabletPC support" }, diff --git a/osu.Game/Overlays/Options/RendererOptions.cs b/osu.Game/Overlays/Options/RendererOptions.cs index b04ea34224..bee07de2e3 100644 --- a/osu.Game/Overlays/Options/RendererOptions.cs +++ b/osu.Game/Overlays/Options/RendererOptions.cs @@ -7,9 +7,10 @@ namespace osu.Game.Overlays.Options { public class RendererOptions : OptionsSubsection { + protected override string Header => "Renderer"; + public RendererOptions() { - Header = "Renderer"; // NOTE: Compatability mode omitted Children = new Drawable[] { diff --git a/osu.Game/Overlays/Options/SkinOptions.cs b/osu.Game/Overlays/Options/SkinOptions.cs index c3ad00d5fc..ae7ae3f2ab 100644 --- a/osu.Game/Overlays/Options/SkinOptions.cs +++ b/osu.Game/Overlays/Options/SkinOptions.cs @@ -1,4 +1,5 @@ using System; +using OpenTK; using osu.Framework.Graphics; using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.UserInterface; @@ -8,41 +9,36 @@ namespace osu.Game.Overlays.Options { public class SkinOptions : OptionsSection { + protected override string Header => "Skin"; + public SkinOptions() { - Header = "Skin"; + content.Spacing = new Vector2(0, 5); Children = new Drawable[] { - new OptionsSubsection + new SpriteText { Text = "TODO: Skin preview textures" }, + new SpriteText { Text = "Current skin: TODO dropdown" }, + new OsuButton { - Header = "Skin", - Children = new Drawable[] - { - new SpriteText { Text = "TODO: Skin preview textures" }, - new SpriteText { Text = "Current skin: TODO dropdown" }, - new OsuButton - { - RelativeSizeAxes = Axes.X, - Text = "Preview gameplay", - }, - new OsuButton - { - RelativeSizeAxes = Axes.X, - Text = "Open skin folder", - }, - new OsuButton - { - RelativeSizeAxes = Axes.X, - Text = "Export as .osk", - }, - new BasicCheckBox { LabelText = "Ignore all beatmap skins" }, - new BasicCheckBox { LabelText = "Use skin's sound samples" }, - new BasicCheckBox { LabelText = "Use Taiko skin for Taiko mode" }, - new BasicCheckBox { LabelText = "Always use skin cursor" }, - new SpriteText { Text = "Cursor size: TODO slider" }, - new BasicCheckBox { LabelText = "Automatic cursor size" }, - } - } + RelativeSizeAxes = Axes.X, + Text = "Preview gameplay", + }, + new OsuButton + { + RelativeSizeAxes = Axes.X, + Text = "Open skin folder", + }, + new OsuButton + { + RelativeSizeAxes = Axes.X, + Text = "Export as .osk", + }, + new BasicCheckBox { LabelText = "Ignore all beatmap skins" }, + new BasicCheckBox { LabelText = "Use skin's sound samples" }, + new BasicCheckBox { LabelText = "Use Taiko skin for Taiko mode" }, + new BasicCheckBox { LabelText = "Always use skin cursor" }, + new SpriteText { Text = "Cursor size: TODO slider" }, + new BasicCheckBox { LabelText = "Automatic cursor size" }, }; } } diff --git a/osu.Game/Overlays/Options/SongSelectGameplayOptions.cs b/osu.Game/Overlays/Options/SongSelectGameplayOptions.cs index 9819406389..edbb1d43c5 100644 --- a/osu.Game/Overlays/Options/SongSelectGameplayOptions.cs +++ b/osu.Game/Overlays/Options/SongSelectGameplayOptions.cs @@ -6,9 +6,10 @@ namespace osu.Game.Overlays.Options { public class SongSelectGameplayOptions : OptionsSubsection { + protected override string Header => "Song Select"; + public SongSelectGameplayOptions() { - Header = "Song Select"; Children = new Drawable[] { new SpriteText { Text = "Display beatmaps from: TODO slider" }, diff --git a/osu.Game/Overlays/Options/SongSelectGraphicsOptions.cs b/osu.Game/Overlays/Options/SongSelectGraphicsOptions.cs index bdb28e29b2..b6a6e0f51e 100644 --- a/osu.Game/Overlays/Options/SongSelectGraphicsOptions.cs +++ b/osu.Game/Overlays/Options/SongSelectGraphicsOptions.cs @@ -5,9 +5,10 @@ namespace osu.Game.Overlays.Options { public class SongSelectGraphicsOptions : OptionsSubsection { + protected override string Header => "Song Select"; + public SongSelectGraphicsOptions() { - Header = "Song Select"; Children = new[] { new BasicCheckBox { LabelText = "Show thumbnails" } diff --git a/osu.Game/Overlays/Options/UpdateOptions.cs b/osu.Game/Overlays/Options/UpdateOptions.cs index 4d523cf079..000d38cfb3 100644 --- a/osu.Game/Overlays/Options/UpdateOptions.cs +++ b/osu.Game/Overlays/Options/UpdateOptions.cs @@ -12,10 +12,10 @@ namespace osu.Game.Overlays.Options public class UpdateOptions : OptionsSubsection { private BasicStorage storage; + protected override string Header => "Updates"; public UpdateOptions() { - Header = "Updates"; Children = new Drawable[] { new SpriteText { Text = "TODO: Dropdown" }, diff --git a/osu.Game/Overlays/Options/VolumeOptions.cs b/osu.Game/Overlays/Options/VolumeOptions.cs index 93d4568877..654841d177 100644 --- a/osu.Game/Overlays/Options/VolumeOptions.cs +++ b/osu.Game/Overlays/Options/VolumeOptions.cs @@ -7,9 +7,10 @@ namespace osu.Game.Overlays.Options { public class VolumeOptions : OptionsSubsection { + protected override string Header => "Volume"; + public VolumeOptions() { - Header = "Volume"; Children = new Drawable[] { new SpriteText { Text = "Master: TODO slider" },