From 511fccdba733a8f70112024fd9a182ac636342c8 Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Thu, 24 Aug 2017 17:28:47 +0900 Subject: [PATCH 01/14] Add editor menu bar test case. --- osu-framework | 2 +- .../Visual/TestCaseEditorMenuBar.cs | 184 ++++++++++++++++++ osu.Desktop.Tests/osu.Desktop.Tests.csproj | 1 + 3 files changed, 186 insertions(+), 1 deletion(-) create mode 100644 osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs diff --git a/osu-framework b/osu-framework index 1ba1e8ef1e..fbbcd942e2 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 1ba1e8ef1e5ec0466632be02492023a081cb85ab +Subproject commit fbbcd942e262778b166acde2cc89a10782734f2d diff --git a/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs b/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs new file mode 100644 index 0000000000..455c25f385 --- /dev/null +++ b/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs @@ -0,0 +1,184 @@ +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using OpenTK; +using OpenTK.Graphics; +using osu.Framework.Allocation; +using osu.Framework.Graphics; +using osu.Framework.Graphics.Containers; +using osu.Framework.Graphics.Shapes; +using osu.Framework.Graphics.Sprites; +using osu.Framework.Graphics.UserInterface; +using osu.Framework.Testing; +using osu.Game.Graphics; +using osu.Game.Graphics.Sprites; +using osu.Game.Graphics.UserInterface; + +namespace osu.Desktop.Tests.Visual +{ + public class TestCaseEditorMenuBar : TestCase + { + public TestCaseEditorMenuBar() + { + Add(new Container + { + Anchor = Anchor.Centre, + Origin = Anchor.Centre, + Width = 500, + Child = new EditorMenuBar + { + Items = new[] + { + new EditorMenuBarItem("File") + { + Items = new OsuContextMenuItem[] + { + new EditorContextMenuItem("Clear All Notes"), + new EditorContextMenuItem("Open Difficulty..."), + new EditorContextMenuItem("Save"), + new EditorContextMenuItem("Create a new Difficulty..."), + new EditorContextMenuSpacer(), + new EditorContextMenuItem("Revert to Saved"), + new EditorContextMenuItem("Revert to Saved (Full)"), + new EditorContextMenuSpacer(), + new EditorContextMenuItem("Test Beatmap"), + new EditorContextMenuItem("Open AiMod"), + new EditorContextMenuSpacer(), + new EditorContextMenuItem("Upload Beatmap..."), + new EditorContextMenuItem("Export Package"), + new EditorContextMenuItem("Export Map Package"), + new EditorContextMenuItem("Import from..."), + new EditorContextMenuSpacer(), + new EditorContextMenuItem("Open Song Folder"), + new EditorContextMenuItem("Open .osu in Notepad"), + new EditorContextMenuItem("Open .osb in Notepad"), + new EditorContextMenuSpacer(), + new EditorContextMenuItem("Exit"), + } + }, + new EditorMenuBarItem("Timing") + { + Items = new[] + { + new EditorContextMenuItem("Time Signature"), + new EditorContextMenuItem("Metronome Clicks"), + new EditorContextMenuSpacer(), + new EditorContextMenuItem("Add Timing Section"), + new EditorContextMenuItem("Add Inheriting Section"), + new EditorContextMenuItem("Reset Current Section"), + new EditorContextMenuItem("Delete Timing Section"), + new EditorContextMenuItem("Resnap Current Section"), + new EditorContextMenuSpacer(), + new EditorContextMenuItem("Timing Setup"), + new EditorContextMenuSpacer(), + new EditorContextMenuItem("Resnap All Notes", MenuItemType.Destructive), + new EditorContextMenuItem("Move all notes in time...", MenuItemType.Destructive), + new EditorContextMenuItem("Recalculate Slider Lengths", MenuItemType.Destructive), + new EditorContextMenuItem("Delete All Timing Sections", MenuItemType.Destructive), + new EditorContextMenuSpacer(), + new EditorContextMenuItem("Set Current Position as Preview Point"), + } + }, + new EditorMenuBarItem("Testing") + { + Items = new[] + { + new EditorContextMenuItem("Item 1"), + new EditorContextMenuItem("Item 2"), + new EditorContextMenuItem("Item 3"), + } + }, + } + } + }); + } + } + + public class EditorMenuBar : MenuBar + { + } + + public class EditorMenuBarItem : MenuBarItem + { + private const int fade_duration = 250; + private const float text_size = 17; + + private readonly Container background; + + private Color4 normalColour; + + public EditorMenuBarItem(string title) + : base(title) + { + Content.Padding = new MarginPadding(8); + + AddInternal(background = new Container + { + RelativeSizeAxes = Axes.Both, + Masking = true, + Depth = float.MaxValue, + Alpha = 0, + Child = new Container + { + // The following is done so we can have top rounded corners but not bottom corners + RelativeSizeAxes = Axes.Both, + Height = 2, + Masking = true, + CornerRadius = 5, + Child = new Box { RelativeSizeAxes = Axes.Both } + } + }); + } + + [BackgroundDependencyLoader] + private void load(OsuColour colours) + { + background.Colour = colours.Gray3; + ContextMenu.Menu.Background.Colour = colours.Gray3; + TitleText.Colour = normalColour = colours.BlueLight; + } + + public override void Open() + { + base.Open(); + + background.FadeIn(fade_duration, Easing.OutQuint); + TitleText.FadeColour(Color4.White, fade_duration, Easing.OutQuint); + } + + public override void Close() + { + base.Close(); + + background.FadeOut(fade_duration, Easing.OutQuint); + TitleText.FadeColour(normalColour, fade_duration, Easing.OutQuint); + } + + protected override SpriteText CreateTitleText() => new OsuSpriteText { TextSize = text_size }; + + protected override ContextMenu CreateContextMenu() => new OsuContextMenu + { + OriginPosition = new Vector2(8, 0) + }; + } + + public class EditorContextMenuSpacer : EditorContextMenuItem + { + public override bool HandleInput => false; + + public EditorContextMenuSpacer() + : base(" ") + { + } + } + + public class EditorContextMenuItem : OsuContextMenuItem + { + private const int min_text_length = 40; + + public EditorContextMenuItem(string title, MenuItemType type = MenuItemType.Standard) + : base(title.PadRight(min_text_length), type) + { + } + } +} diff --git a/osu.Desktop.Tests/osu.Desktop.Tests.csproj b/osu.Desktop.Tests/osu.Desktop.Tests.csproj index 24d112a45c..86268e6110 100644 --- a/osu.Desktop.Tests/osu.Desktop.Tests.csproj +++ b/osu.Desktop.Tests/osu.Desktop.Tests.csproj @@ -87,6 +87,7 @@ + From 26a4238a383a034feca20a3c586476d41832b57b Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Thu, 24 Aug 2017 17:31:23 +0900 Subject: [PATCH 02/14] Make classes private for now. --- .../Visual/TestCaseEditorMenuBar.cs | 146 +++++++++--------- 1 file changed, 73 insertions(+), 73 deletions(-) diff --git a/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs b/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs index 455c25f385..7c46107365 100644 --- a/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs +++ b/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs @@ -92,93 +92,93 @@ namespace osu.Desktop.Tests.Visual } }); } - } - public class EditorMenuBar : MenuBar - { - } - - public class EditorMenuBarItem : MenuBarItem - { - private const int fade_duration = 250; - private const float text_size = 17; - - private readonly Container background; - - private Color4 normalColour; - - public EditorMenuBarItem(string title) - : base(title) + private class EditorMenuBar : MenuBar { - Content.Padding = new MarginPadding(8); + } - AddInternal(background = new Container + private class EditorMenuBarItem : MenuBarItem + { + private const int fade_duration = 250; + private const float text_size = 17; + + private readonly Container background; + + private Color4 normalColour; + + public EditorMenuBarItem(string title) + : base(title) { - RelativeSizeAxes = Axes.Both, - Masking = true, - Depth = float.MaxValue, - Alpha = 0, - Child = new Container + Content.Padding = new MarginPadding(8); + + AddInternal(background = new Container { - // The following is done so we can have top rounded corners but not bottom corners RelativeSizeAxes = Axes.Both, - Height = 2, Masking = true, - CornerRadius = 5, - Child = new Box { RelativeSizeAxes = Axes.Both } - } - }); + Depth = float.MaxValue, + Alpha = 0, + Child = new Container + { + // The following is done so we can have top rounded corners but not bottom corners + RelativeSizeAxes = Axes.Both, + Height = 2, + Masking = true, + CornerRadius = 5, + Child = new Box { RelativeSizeAxes = Axes.Both } + } + }); + } + + [BackgroundDependencyLoader] + private void load(OsuColour colours) + { + background.Colour = colours.Gray3; + ContextMenu.Menu.Background.Colour = colours.Gray3; + TitleText.Colour = normalColour = colours.BlueLight; + } + + public override void Open() + { + base.Open(); + + background.FadeIn(fade_duration, Easing.OutQuint); + TitleText.FadeColour(Color4.White, fade_duration, Easing.OutQuint); + } + + public override void Close() + { + base.Close(); + + background.FadeOut(fade_duration, Easing.OutQuint); + TitleText.FadeColour(normalColour, fade_duration, Easing.OutQuint); + } + + protected override SpriteText CreateTitleText() => new OsuSpriteText { TextSize = text_size }; + + protected override ContextMenu CreateContextMenu() => new OsuContextMenu + { + OriginPosition = new Vector2(8, 0) + }; } - [BackgroundDependencyLoader] - private void load(OsuColour colours) + private class EditorContextMenuSpacer : EditorContextMenuItem { - background.Colour = colours.Gray3; - ContextMenu.Menu.Background.Colour = colours.Gray3; - TitleText.Colour = normalColour = colours.BlueLight; + public override bool HandleInput => false; + + public EditorContextMenuSpacer() + : base(" ") + { + } } - public override void Open() + private class EditorContextMenuItem : OsuContextMenuItem { - base.Open(); + private const int min_text_length = 40; - background.FadeIn(fade_duration, Easing.OutQuint); - TitleText.FadeColour(Color4.White, fade_duration, Easing.OutQuint); - } - - public override void Close() - { - base.Close(); - - background.FadeOut(fade_duration, Easing.OutQuint); - TitleText.FadeColour(normalColour, fade_duration, Easing.OutQuint); - } - - protected override SpriteText CreateTitleText() => new OsuSpriteText { TextSize = text_size }; - - protected override ContextMenu CreateContextMenu() => new OsuContextMenu - { - OriginPosition = new Vector2(8, 0) - }; - } - - public class EditorContextMenuSpacer : EditorContextMenuItem - { - public override bool HandleInput => false; - - public EditorContextMenuSpacer() - : base(" ") - { - } - } - - public class EditorContextMenuItem : OsuContextMenuItem - { - private const int min_text_length = 40; - - public EditorContextMenuItem(string title, MenuItemType type = MenuItemType.Standard) - : base(title.PadRight(min_text_length), type) - { + public EditorContextMenuItem(string title, MenuItemType type = MenuItemType.Standard) + : base(title.PadRight(min_text_length), type) + { + } } } } From a863eb2a2ffef640a85be6e287de46980af71a1f Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Thu, 24 Aug 2017 17:43:56 +0900 Subject: [PATCH 03/14] Add EditorMenuBarItem colours. --- osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs b/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs index 7c46107365..8d14f5f2df 100644 --- a/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs +++ b/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs @@ -31,7 +31,7 @@ namespace osu.Desktop.Tests.Visual { new EditorMenuBarItem("File") { - Items = new OsuContextMenuItem[] + Items = new[] { new EditorContextMenuItem("Clear All Notes"), new EditorContextMenuItem("Open Difficulty..."), @@ -179,6 +179,13 @@ namespace osu.Desktop.Tests.Visual : base(title.PadRight(min_text_length), type) { } + + [BackgroundDependencyLoader] + private void load(OsuColour colours) + { + BackgroundColour = colours.Gray3; + BackgroundColourHover = colours.Gray2; + } } } } From c39bb6e64777933287fabcf1f7a6b25945638ba2 Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Thu, 24 Aug 2017 17:50:22 +0900 Subject: [PATCH 04/14] Pretty-ifying test case. --- .../Visual/TestCaseEditorMenuBar.cs | 127 +++++++++--------- 1 file changed, 60 insertions(+), 67 deletions(-) diff --git a/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs b/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs index 8d14f5f2df..49a382c9f9 100644 --- a/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs +++ b/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs @@ -20,83 +20,76 @@ namespace osu.Desktop.Tests.Visual { public TestCaseEditorMenuBar() { - Add(new Container + Add(new MenuBar { - Anchor = Anchor.Centre, - Origin = Anchor.Centre, - Width = 500, - Child = new EditorMenuBar + Anchor = Anchor.TopCentre, + Origin = Anchor.TopCentre, + Y = 50, + Items = new[] { - Items = new[] + new EditorMenuBarItem("File") { - new EditorMenuBarItem("File") + Items = new[] { - Items = new[] - { - new EditorContextMenuItem("Clear All Notes"), - new EditorContextMenuItem("Open Difficulty..."), - new EditorContextMenuItem("Save"), - new EditorContextMenuItem("Create a new Difficulty..."), - new EditorContextMenuSpacer(), - new EditorContextMenuItem("Revert to Saved"), - new EditorContextMenuItem("Revert to Saved (Full)"), - new EditorContextMenuSpacer(), - new EditorContextMenuItem("Test Beatmap"), - new EditorContextMenuItem("Open AiMod"), - new EditorContextMenuSpacer(), - new EditorContextMenuItem("Upload Beatmap..."), - new EditorContextMenuItem("Export Package"), - new EditorContextMenuItem("Export Map Package"), - new EditorContextMenuItem("Import from..."), - new EditorContextMenuSpacer(), - new EditorContextMenuItem("Open Song Folder"), - new EditorContextMenuItem("Open .osu in Notepad"), - new EditorContextMenuItem("Open .osb in Notepad"), - new EditorContextMenuSpacer(), - new EditorContextMenuItem("Exit"), - } - }, - new EditorMenuBarItem("Timing") + new EditorContextMenuItem("Clear All Notes"), + new EditorContextMenuItem("Open Difficulty..."), + new EditorContextMenuItem("Save"), + new EditorContextMenuItem("Create a new Difficulty..."), + new EditorContextMenuSpacer(), + new EditorContextMenuItem("Revert to Saved"), + new EditorContextMenuItem("Revert to Saved (Full)"), + new EditorContextMenuSpacer(), + new EditorContextMenuItem("Test Beatmap"), + new EditorContextMenuItem("Open AiMod"), + new EditorContextMenuSpacer(), + new EditorContextMenuItem("Upload Beatmap..."), + new EditorContextMenuItem("Export Package"), + new EditorContextMenuItem("Export Map Package"), + new EditorContextMenuItem("Import from..."), + new EditorContextMenuSpacer(), + new EditorContextMenuItem("Open Song Folder"), + new EditorContextMenuItem("Open .osu in Notepad"), + new EditorContextMenuItem("Open .osb in Notepad"), + new EditorContextMenuSpacer(), + new EditorContextMenuItem("Exit"), + } + }, + new EditorMenuBarItem("Timing") + { + Items = new[] { - Items = new[] - { - new EditorContextMenuItem("Time Signature"), - new EditorContextMenuItem("Metronome Clicks"), - new EditorContextMenuSpacer(), - new EditorContextMenuItem("Add Timing Section"), - new EditorContextMenuItem("Add Inheriting Section"), - new EditorContextMenuItem("Reset Current Section"), - new EditorContextMenuItem("Delete Timing Section"), - new EditorContextMenuItem("Resnap Current Section"), - new EditorContextMenuSpacer(), - new EditorContextMenuItem("Timing Setup"), - new EditorContextMenuSpacer(), - new EditorContextMenuItem("Resnap All Notes", MenuItemType.Destructive), - new EditorContextMenuItem("Move all notes in time...", MenuItemType.Destructive), - new EditorContextMenuItem("Recalculate Slider Lengths", MenuItemType.Destructive), - new EditorContextMenuItem("Delete All Timing Sections", MenuItemType.Destructive), - new EditorContextMenuSpacer(), - new EditorContextMenuItem("Set Current Position as Preview Point"), - } - }, - new EditorMenuBarItem("Testing") + new EditorContextMenuItem("Time Signature"), + new EditorContextMenuItem("Metronome Clicks"), + new EditorContextMenuSpacer(), + new EditorContextMenuItem("Add Timing Section"), + new EditorContextMenuItem("Add Inheriting Section"), + new EditorContextMenuItem("Reset Current Section"), + new EditorContextMenuItem("Delete Timing Section"), + new EditorContextMenuItem("Resnap Current Section"), + new EditorContextMenuSpacer(), + new EditorContextMenuItem("Timing Setup"), + new EditorContextMenuSpacer(), + new EditorContextMenuItem("Resnap All Notes", MenuItemType.Destructive), + new EditorContextMenuItem("Move all notes in time...", MenuItemType.Destructive), + new EditorContextMenuItem("Recalculate Slider Lengths", MenuItemType.Destructive), + new EditorContextMenuItem("Delete All Timing Sections", MenuItemType.Destructive), + new EditorContextMenuSpacer(), + new EditorContextMenuItem("Set Current Position as Preview Point"), + } + }, + new EditorMenuBarItem("Testing") + { + Items = new[] { - Items = new[] - { - new EditorContextMenuItem("Item 1"), - new EditorContextMenuItem("Item 2"), - new EditorContextMenuItem("Item 3"), - } - }, - } + new EditorContextMenuItem("Item 1"), + new EditorContextMenuItem("Item 2"), + new EditorContextMenuItem("Item 3"), + } + }, } }); } - private class EditorMenuBar : MenuBar - { - } - private class EditorMenuBarItem : MenuBarItem { private const int fade_duration = 250; From 4ab209bdce8a5fbc234c6bf899e62a9c8290db5b Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Thu, 24 Aug 2017 19:05:51 +0900 Subject: [PATCH 05/14] Add EditorContextMenu in line with framework changes To avoid public Menu. --- osu-framework | 2 +- osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/osu-framework b/osu-framework index fbbcd942e2..a5fd0c82c8 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit fbbcd942e262778b166acde2cc89a10782734f2d +Subproject commit a5fd0c82c8f86d41c80ac1b0b07727cb312330f1 diff --git a/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs b/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs index 49a382c9f9..7a9c97f5d5 100644 --- a/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs +++ b/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs @@ -126,7 +126,6 @@ namespace osu.Desktop.Tests.Visual private void load(OsuColour colours) { background.Colour = colours.Gray3; - ContextMenu.Menu.Background.Colour = colours.Gray3; TitleText.Colour = normalColour = colours.BlueLight; } @@ -148,12 +147,21 @@ namespace osu.Desktop.Tests.Visual protected override SpriteText CreateTitleText() => new OsuSpriteText { TextSize = text_size }; - protected override ContextMenu CreateContextMenu() => new OsuContextMenu + protected override ContextMenu CreateContextMenu() => new EditorContextMenu { OriginPosition = new Vector2(8, 0) }; } + private class EditorContextMenu : OsuContextMenu + { + [BackgroundDependencyLoader] + private void load(OsuColour colours) + { + Menu.Background.Colour = colours.Gray3; + } + } + private class EditorContextMenuSpacer : EditorContextMenuItem { public override bool HandleInput => false; From 5dae408ecb1204293a664862b78a9e8567fbfc5a Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Mon, 28 Aug 2017 15:32:12 +0900 Subject: [PATCH 06/14] Reimplement TestCaseEditorMenuBar. --- osu-framework | 2 +- .../Visual/TestCaseEditorMenuBar.cs | 272 ++++++++++-------- 2 files changed, 157 insertions(+), 117 deletions(-) diff --git a/osu-framework b/osu-framework index 2cb3e59c8b..f6a1df24ee 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 2cb3e59c8bc7e67edef4dfe7f9c7dfc01db386a7 +Subproject commit f6a1df24eeef78e89f2d6e24fe1b43756eaae51e diff --git a/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs b/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs index 7a9c97f5d5..b7a4bc355d 100644 --- a/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs +++ b/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs @@ -1,6 +1,7 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +using System; using OpenTK; using OpenTK.Graphics; using osu.Framework.Allocation; @@ -20,7 +21,7 @@ namespace osu.Desktop.Tests.Visual { public TestCaseEditorMenuBar() { - Add(new MenuBar + Add(new EditorMenuBar { Anchor = Anchor.TopCentre, Origin = Anchor.TopCentre, @@ -31,162 +32,201 @@ namespace osu.Desktop.Tests.Visual { Items = new[] { - new EditorContextMenuItem("Clear All Notes"), - new EditorContextMenuItem("Open Difficulty..."), - new EditorContextMenuItem("Save"), - new EditorContextMenuItem("Create a new Difficulty..."), - new EditorContextMenuSpacer(), - new EditorContextMenuItem("Revert to Saved"), - new EditorContextMenuItem("Revert to Saved (Full)"), - new EditorContextMenuSpacer(), - new EditorContextMenuItem("Test Beatmap"), - new EditorContextMenuItem("Open AiMod"), - new EditorContextMenuSpacer(), - new EditorContextMenuItem("Upload Beatmap..."), - new EditorContextMenuItem("Export Package"), - new EditorContextMenuItem("Export Map Package"), - new EditorContextMenuItem("Import from..."), - new EditorContextMenuSpacer(), - new EditorContextMenuItem("Open Song Folder"), - new EditorContextMenuItem("Open .osu in Notepad"), - new EditorContextMenuItem("Open .osb in Notepad"), - new EditorContextMenuSpacer(), - new EditorContextMenuItem("Exit"), + new EditorMenuItem("Clear All Notes"), + new EditorMenuItem("Open Difficulty..."), + new EditorMenuItem("Save"), + new EditorMenuItem("Create a new Difficulty..."), + new EditorMenuSpacer(), + new EditorMenuItem("Revert to Saved"), + new EditorMenuItem("Revert to Saved (Full)"), + new EditorMenuSpacer(), + new EditorMenuItem("Test Beatmap"), + new EditorMenuItem("Open AiMod"), + new EditorMenuSpacer(), + new EditorMenuItem("Upload Beatmap..."), + new EditorMenuItem("Export Package"), + new EditorMenuItem("Export Map Package"), + new EditorMenuItem("Import from..."), + new EditorMenuSpacer(), + new EditorMenuItem("Open Song Folder"), + new EditorMenuItem("Open .osu in Notepad"), + new EditorMenuItem("Open .osb in Notepad"), + new EditorMenuSpacer(), + new EditorMenuItem("Exit"), } }, new EditorMenuBarItem("Timing") { Items = new[] { - new EditorContextMenuItem("Time Signature"), - new EditorContextMenuItem("Metronome Clicks"), - new EditorContextMenuSpacer(), - new EditorContextMenuItem("Add Timing Section"), - new EditorContextMenuItem("Add Inheriting Section"), - new EditorContextMenuItem("Reset Current Section"), - new EditorContextMenuItem("Delete Timing Section"), - new EditorContextMenuItem("Resnap Current Section"), - new EditorContextMenuSpacer(), - new EditorContextMenuItem("Timing Setup"), - new EditorContextMenuSpacer(), - new EditorContextMenuItem("Resnap All Notes", MenuItemType.Destructive), - new EditorContextMenuItem("Move all notes in time...", MenuItemType.Destructive), - new EditorContextMenuItem("Recalculate Slider Lengths", MenuItemType.Destructive), - new EditorContextMenuItem("Delete All Timing Sections", MenuItemType.Destructive), - new EditorContextMenuSpacer(), - new EditorContextMenuItem("Set Current Position as Preview Point"), + new EditorMenuItem("Time Signature"), + new EditorMenuItem("Metronome Clicks"), + new EditorMenuSpacer(), + new EditorMenuItem("Add Timing Section"), + new EditorMenuItem("Add Inheriting Section"), + new EditorMenuItem("Reset Current Section"), + new EditorMenuItem("Delete Timing Section"), + new EditorMenuItem("Resnap Current Section"), + new EditorMenuSpacer(), + new EditorMenuItem("Timing Setup"), + new EditorMenuSpacer(), + new EditorMenuItem("Resnap All Notes", MenuItemType.Destructive), + new EditorMenuItem("Move all notes in time...", MenuItemType.Destructive), + new EditorMenuItem("Recalculate Slider Lengths", MenuItemType.Destructive), + new EditorMenuItem("Delete All Timing Sections", MenuItemType.Destructive), + new EditorMenuSpacer(), + new EditorMenuItem("Set Current Position as Preview Point"), } }, new EditorMenuBarItem("Testing") { Items = new[] { - new EditorContextMenuItem("Item 1"), - new EditorContextMenuItem("Item 2"), - new EditorContextMenuItem("Item 3"), + new EditorMenuItem("Item 1"), + new EditorMenuItem("Item 2"), + new EditorMenuItem("Item 3"), } }, } }); } - private class EditorMenuBarItem : MenuBarItem + private class EditorMenuBar : MenuBar { - private const int fade_duration = 250; - private const float text_size = 17; + protected override DrawableMenuBarItem CreateDrawableMenuBarItem(MenuItem item) => new DrawableEditorMenuBarItem(item); - private readonly Container background; - - private Color4 normalColour; - - public EditorMenuBarItem(string title) - : base(title) + private class DrawableEditorMenuBarItem : DrawableMenuBarItem { - Content.Padding = new MarginPadding(8); + private const int fade_duration = 250; + private const float text_size = 17; - AddInternal(background = new Container + private readonly Container background; + + private Color4 normalColour; + + public DrawableEditorMenuBarItem(MenuItem item) + : base(item) { - RelativeSizeAxes = Axes.Both, - Masking = true, - Depth = float.MaxValue, - Alpha = 0, - Child = new Container + if (!(item is EditorMenuBarItem)) + throw new ArgumentException($"{nameof(item)} must be a {nameof(EditorMenuBarItem)}."); + + Text.Padding = new MarginPadding(8); + + AddInternal(background = new Container { - // The following is done so we can have top rounded corners but not bottom corners RelativeSizeAxes = Axes.Both, - Height = 2, Masking = true, - CornerRadius = 5, - Child = new Box { RelativeSizeAxes = Axes.Both } + Depth = float.MaxValue, + Alpha = 0, + Child = new Container + { + // The following is done so we can have top rounded corners but not bottom corners + RelativeSizeAxes = Axes.Both, + Height = 2, + Masking = true, + CornerRadius = 5, + Child = new Box { RelativeSizeAxes = Axes.Both } + } + }); + + Menu.OnOpen += menuOpen; + Menu.OnClose += menuClose; + } + + [BackgroundDependencyLoader] + private void load(OsuColour colours) + { + background.Colour = colours.Gray3; + Text.Colour = normalColour = colours.BlueLight; + } + + private void menuOpen() + { + background.FadeIn(fade_duration, Easing.OutQuint); + Text.FadeColour(Color4.White, fade_duration, Easing.OutQuint); + } + + private void menuClose() + { + background.FadeOut(fade_duration, Easing.OutQuint); + Text.FadeColour(normalColour, fade_duration, Easing.OutQuint); + } + + protected override SpriteText CreateText() => new OsuSpriteText { TextSize = text_size }; + + protected override Menu CreateMenu() => new EditorMenu(); + + private class EditorMenu : OsuMenu + { + public EditorMenu() + { + Anchor = Anchor.BottomLeft; + BypassAutoSizeAxes = Axes.Both; + OriginPosition = new Vector2(8, 0); } - }); - } - [BackgroundDependencyLoader] - private void load(OsuColour colours) - { - background.Colour = colours.Gray3; - TitleText.Colour = normalColour = colours.BlueLight; - } + [BackgroundDependencyLoader] + private void load(OsuColour colours) + { + BackgroundColour = colours.Gray3; + } - public override void Open() - { - base.Open(); + protected override DrawableMenuItem CreateDrawableMenuItem(MenuItem item) => new DrawableEditorMenuItem(item); - background.FadeIn(fade_duration, Easing.OutQuint); - TitleText.FadeColour(Color4.White, fade_duration, Easing.OutQuint); - } + private class DrawableEditorMenuItem : DrawableOsuMenuItem + { + public override bool HandleInput => !isSpacer; + private readonly bool isSpacer; - public override void Close() - { - base.Close(); + public DrawableEditorMenuItem(MenuItem item) + : base(item) + { + if (!(item is EditorMenuItem)) + throw new ArgumentException($"{nameof(item)} must be a {nameof(EditorMenuItem)}."); - background.FadeOut(fade_duration, Easing.OutQuint); - TitleText.FadeColour(normalColour, fade_duration, Easing.OutQuint); - } + isSpacer = item is EditorMenuSpacer; + } - protected override SpriteText CreateTitleText() => new OsuSpriteText { TextSize = text_size }; - - protected override ContextMenu CreateContextMenu() => new EditorContextMenu - { - OriginPosition = new Vector2(8, 0) - }; - } - - private class EditorContextMenu : OsuContextMenu - { - [BackgroundDependencyLoader] - private void load(OsuColour colours) - { - Menu.Background.Colour = colours.Gray3; + [BackgroundDependencyLoader] + private void load(OsuColour colours) + { + BackgroundColour = colours.Gray3; + BackgroundColourHover = colours.Gray2; + } + } + } } } - private class EditorContextMenuSpacer : EditorContextMenuItem + private class EditorMenuBarItem : MenuItem { - public override bool HandleInput => false; + public EditorMenuBarItem(string text) + : base(text) + { + } + } - public EditorContextMenuSpacer() + private class EditorMenuItem : OsuMenuItem + { + private const int min_text_length = 40; + + public EditorMenuItem(string text, MenuItemType type = MenuItemType.Standard) + : base(text.PadRight(min_text_length), type) + { + } + + public EditorMenuItem(string text, MenuItemType type, Action action) + : base(text.PadRight(min_text_length), type, action) + { + } + } + + private class EditorMenuSpacer : EditorMenuItem + { + public EditorMenuSpacer() : base(" ") { } } - - private class EditorContextMenuItem : OsuContextMenuItem - { - private const int min_text_length = 40; - - public EditorContextMenuItem(string title, MenuItemType type = MenuItemType.Standard) - : base(title.PadRight(min_text_length), type) - { - } - - [BackgroundDependencyLoader] - private void load(OsuColour colours) - { - BackgroundColour = colours.Gray3; - BackgroundColourHover = colours.Gray2; - } - } } } From 7c9c7f93aece86a7e976c9be7032f391832d188d Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Mon, 28 Aug 2017 15:42:21 +0900 Subject: [PATCH 07/14] Remove unnecessary exception, replace with default styling. --- osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs b/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs index b7a4bc355d..95d34543bb 100644 --- a/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs +++ b/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs @@ -107,8 +107,6 @@ namespace osu.Desktop.Tests.Visual public DrawableEditorMenuBarItem(MenuItem item) : base(item) { - if (!(item is EditorMenuBarItem)) - throw new ArgumentException($"{nameof(item)} must be a {nameof(EditorMenuBarItem)}."); Text.Padding = new MarginPadding(8); @@ -181,8 +179,6 @@ namespace osu.Desktop.Tests.Visual public DrawableEditorMenuItem(MenuItem item) : base(item) { - if (!(item is EditorMenuItem)) - throw new ArgumentException($"{nameof(item)} must be a {nameof(EditorMenuItem)}."); isSpacer = item is EditorMenuSpacer; } From b17d9ac06ea649b977ead563b7b5e4ecefe70ab9 Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Mon, 28 Aug 2017 17:55:50 +0900 Subject: [PATCH 08/14] Move EditorMenuBar into the Edit namespace, and fix a minor styling issue. --- osu-framework | 2 +- .../Visual/TestCaseEditorMenuBar.cs | 145 +-------------- osu.Game/Graphics/UserInterface/OsuMenu.cs | 5 +- osu.Game/Screens/Edit/Editor.cs | 174 ++++++++++++++++++ osu.Game/Screens/Edit/Menus/EditorMenuBar.cs | 131 +++++++++++++ .../Screens/Edit/Menus/EditorMenuBarItem.cs | 15 ++ osu.Game/Screens/Edit/Menus/EditorMenuItem.cs | 23 +++ .../Edit/Menus/EditorMenuItemSpacer.cs | 13 ++ osu.Game/osu.Game.csproj | 4 + 9 files changed, 365 insertions(+), 147 deletions(-) create mode 100644 osu.Game/Screens/Edit/Menus/EditorMenuBar.cs create mode 100644 osu.Game/Screens/Edit/Menus/EditorMenuBarItem.cs create mode 100644 osu.Game/Screens/Edit/Menus/EditorMenuItem.cs create mode 100644 osu.Game/Screens/Edit/Menus/EditorMenuItemSpacer.cs diff --git a/osu-framework b/osu-framework index f6a1df24ee..c7457f0ce9 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit f6a1df24eeef78e89f2d6e24fe1b43756eaae51e +Subproject commit c7457f0ce9ef3f663ee800f6b7fc574e9abff1da diff --git a/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs b/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs index 95d34543bb..9ff4f4c591 100644 --- a/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs +++ b/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs @@ -1,19 +1,10 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; -using OpenTK; -using OpenTK.Graphics; -using osu.Framework.Allocation; using osu.Framework.Graphics; -using osu.Framework.Graphics.Containers; -using osu.Framework.Graphics.Shapes; -using osu.Framework.Graphics.Sprites; -using osu.Framework.Graphics.UserInterface; using osu.Framework.Testing; -using osu.Game.Graphics; -using osu.Game.Graphics.Sprites; using osu.Game.Graphics.UserInterface; +using osu.Game.Screens.Edit.Menus; namespace osu.Desktop.Tests.Visual { @@ -90,139 +81,5 @@ namespace osu.Desktop.Tests.Visual } }); } - - private class EditorMenuBar : MenuBar - { - protected override DrawableMenuBarItem CreateDrawableMenuBarItem(MenuItem item) => new DrawableEditorMenuBarItem(item); - - private class DrawableEditorMenuBarItem : DrawableMenuBarItem - { - private const int fade_duration = 250; - private const float text_size = 17; - - private readonly Container background; - - private Color4 normalColour; - - public DrawableEditorMenuBarItem(MenuItem item) - : base(item) - { - - Text.Padding = new MarginPadding(8); - - AddInternal(background = new Container - { - RelativeSizeAxes = Axes.Both, - Masking = true, - Depth = float.MaxValue, - Alpha = 0, - Child = new Container - { - // The following is done so we can have top rounded corners but not bottom corners - RelativeSizeAxes = Axes.Both, - Height = 2, - Masking = true, - CornerRadius = 5, - Child = new Box { RelativeSizeAxes = Axes.Both } - } - }); - - Menu.OnOpen += menuOpen; - Menu.OnClose += menuClose; - } - - [BackgroundDependencyLoader] - private void load(OsuColour colours) - { - background.Colour = colours.Gray3; - Text.Colour = normalColour = colours.BlueLight; - } - - private void menuOpen() - { - background.FadeIn(fade_duration, Easing.OutQuint); - Text.FadeColour(Color4.White, fade_duration, Easing.OutQuint); - } - - private void menuClose() - { - background.FadeOut(fade_duration, Easing.OutQuint); - Text.FadeColour(normalColour, fade_duration, Easing.OutQuint); - } - - protected override SpriteText CreateText() => new OsuSpriteText { TextSize = text_size }; - - protected override Menu CreateMenu() => new EditorMenu(); - - private class EditorMenu : OsuMenu - { - public EditorMenu() - { - Anchor = Anchor.BottomLeft; - BypassAutoSizeAxes = Axes.Both; - OriginPosition = new Vector2(8, 0); - } - - [BackgroundDependencyLoader] - private void load(OsuColour colours) - { - BackgroundColour = colours.Gray3; - } - - protected override DrawableMenuItem CreateDrawableMenuItem(MenuItem item) => new DrawableEditorMenuItem(item); - - private class DrawableEditorMenuItem : DrawableOsuMenuItem - { - public override bool HandleInput => !isSpacer; - private readonly bool isSpacer; - - public DrawableEditorMenuItem(MenuItem item) - : base(item) - { - - isSpacer = item is EditorMenuSpacer; - } - - [BackgroundDependencyLoader] - private void load(OsuColour colours) - { - BackgroundColour = colours.Gray3; - BackgroundColourHover = colours.Gray2; - } - } - } - } - } - - private class EditorMenuBarItem : MenuItem - { - public EditorMenuBarItem(string text) - : base(text) - { - } - } - - private class EditorMenuItem : OsuMenuItem - { - private const int min_text_length = 40; - - public EditorMenuItem(string text, MenuItemType type = MenuItemType.Standard) - : base(text.PadRight(min_text_length), type) - { - } - - public EditorMenuItem(string text, MenuItemType type, Action action) - : base(text.PadRight(min_text_length), type, action) - { - } - } - - private class EditorMenuSpacer : EditorMenuItem - { - public EditorMenuSpacer() - : base(" ") - { - } - } } } diff --git a/osu.Game/Graphics/UserInterface/OsuMenu.cs b/osu.Game/Graphics/UserInterface/OsuMenu.cs index efc6998ca7..e0bb23df5d 100644 --- a/osu.Game/Graphics/UserInterface/OsuMenu.cs +++ b/osu.Game/Graphics/UserInterface/OsuMenu.cs @@ -105,9 +105,10 @@ namespace osu.Game.Graphics.UserInterface return base.OnClick(state); } - protected override Drawable CreateContent() => text = new TextContainer(); + protected sealed override Drawable CreateContent() => text = CreateTextContainer(); + protected virtual TextContainer CreateTextContainer() => new TextContainer(); - private class TextContainer : Container, IHasText + protected class TextContainer : Container, IHasText { public string Text { diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs index 9f33d624e2..0454609689 100644 --- a/osu.Game/Screens/Edit/Editor.cs +++ b/osu.Game/Screens/Edit/Editor.cs @@ -8,6 +8,11 @@ using osu.Framework.Screens; using osu.Game.Screens.Backgrounds; using osu.Game.Screens.Select; using osu.Framework.Graphics; +using osu.Framework.Graphics.Containers; +using osu.Framework.Graphics.Shapes; +using osu.Game.Graphics; +using osu.Game.Graphics.UserInterface; +using osu.Game.Screens.Edit.Menus; namespace osu.Game.Screens.Edit { @@ -17,6 +22,175 @@ namespace osu.Game.Screens.Edit protected override BackgroundScreen CreateBackground() => new BackgroundScreenCustom(@"Backgrounds/bg4"); + internal override bool ShowOverlays => false; + + public Editor() + { + Add(new Container + { + RelativeSizeAxes = Axes.X, + Height = 40, + Children = new Drawable[] + { + new Box + { + RelativeSizeAxes = Axes.Both, + Colour = OsuColour.FromHex("111") + }, + new EditorMenuBar + { + Anchor = Anchor.CentreLeft, + Origin = Anchor.CentreLeft, + X = 100, + Items = new[] + { + new EditorMenuBarItem("File") + { + Items = new[] + { + new EditorMenuItem("Clear all notes"), + new EditorMenuItem("Open difficulty..."), + new EditorMenuItem("Save"), + new EditorMenuItem("Create new difficulty..."), + new EditorMenuSpacer(), + new EditorMenuItem("Revert to saved"), + new EditorMenuItem("Revert to saved (full"), + new EditorMenuSpacer(), + new EditorMenuItem("Test beatmap"), + new EditorMenuItem("Open AiMod"), + new EditorMenuSpacer(), + new EditorMenuItem("Upload Beatmap..."), + new EditorMenuItem("Export package"), + new EditorMenuItem("Export map package"), + new EditorMenuItem("Import from..."), + new EditorMenuSpacer(), + new EditorMenuItem("Open song folder"), + new EditorMenuItem("Open .osu in Notepad"), + new EditorMenuItem("Open .osb in Notepad"), + new EditorMenuSpacer(), + new EditorMenuItem("Exit", MenuItemType.Standard, Exit) + } + }, + new EditorMenuBarItem("Edit") + { + Items = new[] + { + new EditorMenuItem("Undo"), + new EditorMenuItem("Redo"), + new EditorMenuSpacer(), + new EditorMenuItem("Cut"), + new EditorMenuItem("Copy"), + new EditorMenuItem("Paste"), + new EditorMenuItem("Delete"), + new EditorMenuSpacer(), + new EditorMenuItem("Select all"), + new EditorMenuItem("Clone"), + new EditorMenuSpacer(), + new EditorMenuItem("Reverse selection"), + new EditorMenuItem("Flip horizontally"), + new EditorMenuItem("Flip vertically"), + new EditorMenuItem("Rotate 90deg clockwise"), + new EditorMenuItem("Rotate 90deg anticlockwise"), + new EditorMenuItem("Rotate by..."), + new EditorMenuItem("Scale by..."), + new EditorMenuSpacer(), + new EditorMenuItem("Reset selected objects' samples"), + new EditorMenuItem("Reset all samples", MenuItemType.Destructive), + new EditorMenuItem("Reset combo colours", MenuItemType.Destructive), + new EditorMenuItem("Reset breaks", MenuItemType.Destructive), + new EditorMenuSpacer(), + new EditorMenuItem("Nudge backward"), + new EditorMenuItem("Nudge forward") + } + }, + new EditorMenuBarItem("View") + { + Items = new[] + { + new EditorMenuItem("Compose"), + new EditorMenuItem("Design"), + new EditorMenuItem("Timing"), + new EditorMenuSpacer(), + new EditorMenuItem("Song setup..."), + new EditorMenuItem("Timing setup..."), + new EditorMenuSpacer(), + new EditorMenuItem("Volume"), + new EditorMenuItem("Grid level"), + new EditorMenuItem("Show video"), + new EditorMenuItem("Show sample name"), + new EditorMenuItem("Snaking sliders"), + new EditorMenuItem("Hit animations"), + new EditorMenuItem("Follow points"), + new EditorMenuItem("Stacking") + } + }, + new EditorMenuBarItem("Compose") + { + Items = new[] + { + new EditorMenuItem("Snap divisor"), + new EditorMenuItem("Audio rate"), + new EditorMenuItem("Grid snapping"), + new EditorMenuSpacer(), + new EditorMenuItem("Create polygon cricles..."), + new EditorMenuItem("Convert slider to stream"), + new EditorMenuItem("Enable live mapping mode"), + new EditorMenuItem("Sample import") + } + }, + new EditorMenuBarItem("Design") + { + Items = new[] + { + new EditorMenuItem("Move all elements in time...") + } + }, + new EditorMenuBarItem("Timing") + { + Items = new[] + { + new EditorMenuItem("Time signature"), + new EditorMenuItem("Metronome clicks"), + new EditorMenuSpacer(), + new EditorMenuItem("Add timing section"), + new EditorMenuItem("Add inheriting section"), + new EditorMenuItem("Reset current section"), + new EditorMenuItem("Delete timing section"), + new EditorMenuItem("Resnap current section"), + new EditorMenuSpacer(), + new EditorMenuItem("Timing setup..."), + new EditorMenuSpacer(), + new EditorMenuItem("Resnap all notes", MenuItemType.Destructive), + new EditorMenuItem("Move all notes in time...", MenuItemType.Destructive), + new EditorMenuItem("Recalculate slider lengths", MenuItemType.Destructive), + new EditorMenuItem("Delete all timing sections", MenuItemType.Destructive), + new EditorMenuSpacer(), + new EditorMenuItem("Set current position as preview point") + } + }, + new EditorMenuBarItem("Web") + { + Items = new[] + { + new EditorMenuItem("This Beatmap's information page"), + new EditorMenuItem("This Beatmap's thread"), + new EditorMenuItem("Quick reply") + } + }, + new EditorMenuBarItem("Help") + { + Items = new[] + { + new EditorMenuItem("Show in-game help"), + new EditorMenuItem("View FAQ") + } + } + } + } + } + }); + } + protected override void OnResuming(Screen last) { Beatmap.Value.Track?.Stop(); diff --git a/osu.Game/Screens/Edit/Menus/EditorMenuBar.cs b/osu.Game/Screens/Edit/Menus/EditorMenuBar.cs new file mode 100644 index 0000000000..9fd8669922 --- /dev/null +++ b/osu.Game/Screens/Edit/Menus/EditorMenuBar.cs @@ -0,0 +1,131 @@ +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using osu.Framework.Allocation; +using osu.Framework.Graphics; +using osu.Framework.Graphics.Containers; +using osu.Framework.Graphics.Shapes; +using osu.Framework.Graphics.Sprites; +using osu.Framework.Graphics.UserInterface; +using osu.Game.Graphics; +using osu.Game.Graphics.Sprites; +using osu.Game.Graphics.UserInterface; +using OpenTK; +using OpenTK.Graphics; + +namespace osu.Game.Screens.Edit.Menus +{ + public class EditorMenuBar : MenuBar + { + protected override DrawableMenuBarItem CreateDrawableMenuBarItem(MenuItem item) => new DrawableEditorMenuBarItem(item); + + private class DrawableEditorMenuBarItem : DrawableMenuBarItem + { + private const int fade_duration = 250; + private const float text_size = 14; + + private readonly Container background; + + private Color4 normalColour; + + public DrawableEditorMenuBarItem(MenuItem item) + : base(item) + { + Text.Padding = new MarginPadding(8); + + AddInternal(background = new Container + { + RelativeSizeAxes = Axes.Both, + Masking = true, + Depth = float.MaxValue, + Alpha = 0, + Child = new Container + { + // The following is done so we can have top rounded corners but not bottom corners + RelativeSizeAxes = Axes.Both, + Height = 2, + Masking = true, + CornerRadius = 5, + Child = new Box { RelativeSizeAxes = Axes.Both } + } + }); + + Menu.OnOpen += menuOpen; + Menu.OnClose += menuClose; + } + + [BackgroundDependencyLoader] + private void load(OsuColour colours) + { + background.Colour = colours.Gray3; + Text.Colour = normalColour = colours.BlueLight; + } + + private void menuOpen() + { + background.FadeIn(fade_duration, Easing.OutQuint); + Text.FadeColour(Color4.White, fade_duration, Easing.OutQuint); + } + + private void menuClose() + { + background.FadeOut(fade_duration, Easing.OutQuint); + Text.FadeColour(normalColour, fade_duration, Easing.OutQuint); + } + + protected override SpriteText CreateText() => new OsuSpriteText { TextSize = text_size }; + + protected override Framework.Graphics.UserInterface.Menu CreateMenu() => new EditorMenu(); + + private class EditorMenu : OsuMenu + { + public EditorMenu() + { + Anchor = Anchor.BottomLeft; + BypassAutoSizeAxes = Axes.Both; + OriginPosition = new Vector2(8, 0); + } + + [BackgroundDependencyLoader] + private void load(OsuColour colours) + { + BackgroundColour = colours.Gray3; + } + + protected override MarginPadding ItemFlowContainerPadding => new MarginPadding { Top = 5, Bottom = 5 }; + + protected override DrawableMenuItem CreateDrawableMenuItem(MenuItem item) => new DrawableEditorMenuItem(item); + + private class DrawableEditorMenuItem : DrawableOsuMenuItem + { + public override bool HandleInput => !isSpacer; + private readonly bool isSpacer; + + public DrawableEditorMenuItem(MenuItem item) + : base(item) + { + isSpacer = item is EditorMenuSpacer; + } + + [BackgroundDependencyLoader] + private void load(OsuColour colours) + { + BackgroundColour = colours.Gray3; + BackgroundColourHover = colours.Gray2; + } + + protected override TextContainer CreateTextContainer() => new EditorTextContainer(); + + private class EditorTextContainer : TextContainer + { + public EditorTextContainer() + { + BoldText.TextSize = text_size; + NormalText.TextSize = text_size; + } + } + } + } + } + } +} diff --git a/osu.Game/Screens/Edit/Menus/EditorMenuBarItem.cs b/osu.Game/Screens/Edit/Menus/EditorMenuBarItem.cs new file mode 100644 index 0000000000..201bc6e5c3 --- /dev/null +++ b/osu.Game/Screens/Edit/Menus/EditorMenuBarItem.cs @@ -0,0 +1,15 @@ +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using osu.Framework.Graphics.UserInterface; + +namespace osu.Game.Screens.Edit.Menus +{ + public class EditorMenuBarItem : MenuItem + { + public EditorMenuBarItem(string text) + : base(text) + { + } + } +} diff --git a/osu.Game/Screens/Edit/Menus/EditorMenuItem.cs b/osu.Game/Screens/Edit/Menus/EditorMenuItem.cs new file mode 100644 index 0000000000..c7e36522cf --- /dev/null +++ b/osu.Game/Screens/Edit/Menus/EditorMenuItem.cs @@ -0,0 +1,23 @@ +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using System; +using osu.Game.Graphics.UserInterface; + +namespace osu.Game.Screens.Edit.Menus +{ + public class EditorMenuItem : OsuMenuItem + { + private const int min_text_length = 40; + + public EditorMenuItem(string text, MenuItemType type = MenuItemType.Standard) + : base(text.PadRight(min_text_length), type) + { + } + + public EditorMenuItem(string text, MenuItemType type, Action action) + : base(text.PadRight(min_text_length), type, action) + { + } + } +} diff --git a/osu.Game/Screens/Edit/Menus/EditorMenuItemSpacer.cs b/osu.Game/Screens/Edit/Menus/EditorMenuItemSpacer.cs new file mode 100644 index 0000000000..0e01992846 --- /dev/null +++ b/osu.Game/Screens/Edit/Menus/EditorMenuItemSpacer.cs @@ -0,0 +1,13 @@ +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +namespace osu.Game.Screens.Edit.Menus +{ + public class EditorMenuSpacer : EditorMenuItem + { + public EditorMenuSpacer() + : base(" ") + { + } + } +} diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 325cfba986..05ba3e25ab 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -133,6 +133,10 @@ + + + + From 6304a685c3317b143d7d5d6d3e75769bf7d61dca Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 29 Aug 2017 14:43:23 +0900 Subject: [PATCH 09/14] Update framework --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index c7457f0ce9..167d5cda8f 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit c7457f0ce9ef3f663ee800f6b7fc574e9abff1da +Subproject commit 167d5cda8f3ddae702ffc8d8d22dac67e48b509c From 06fac913bfe5c03e479fca450a5f45ac0ad006cf Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Wed, 6 Sep 2017 21:14:29 +0900 Subject: [PATCH 10/14] Re-implement EditorMenuBar. --- osu-framework | 2 +- osu.Game/Graphics/UserInterface/OsuMenu.cs | 6 +- osu.Game/Screens/Edit/Menus/EditorMenuBar.cs | 160 +++++++++---------- 3 files changed, 83 insertions(+), 85 deletions(-) diff --git a/osu-framework b/osu-framework index 3edf658577..3e91706ad5 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 3edf65857759f32d5a6d07ed523a2892b09c3c6a +Subproject commit 3e91706ad54609c9477588730b5de7db9d1311f8 diff --git a/osu.Game/Graphics/UserInterface/OsuMenu.cs b/osu.Game/Graphics/UserInterface/OsuMenu.cs index 3c9b9797ba..4e23a8939d 100644 --- a/osu.Game/Graphics/UserInterface/OsuMenu.cs +++ b/osu.Game/Graphics/UserInterface/OsuMenu.cs @@ -46,6 +46,11 @@ namespace osu.Game.Graphics.UserInterface protected override DrawableMenuItem CreateDrawableMenuItem(MenuItem item) => new DrawableOsuMenuItem(item); + protected override Menu CreateSubMenu() => new OsuMenu(Direction.Vertical) + { + Anchor = Direction == Direction.Horizontal ? Anchor.BottomLeft : Anchor.TopRight + }; + protected class DrawableOsuMenuItem : DrawableMenuItem { private const int margin_horizontal = 17; @@ -61,7 +66,6 @@ namespace osu.Game.Graphics.UserInterface public DrawableOsuMenuItem(MenuItem item) : base(item) { - } [BackgroundDependencyLoader] diff --git a/osu.Game/Screens/Edit/Menus/EditorMenuBar.cs b/osu.Game/Screens/Edit/Menus/EditorMenuBar.cs index 9fd8669922..15610fcebd 100644 --- a/osu.Game/Screens/Edit/Menus/EditorMenuBar.cs +++ b/osu.Game/Screens/Edit/Menus/EditorMenuBar.cs @@ -5,125 +5,119 @@ using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Shapes; -using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.UserInterface; +using osu.Framework.Input; using osu.Game.Graphics; -using osu.Game.Graphics.Sprites; using osu.Game.Graphics.UserInterface; using OpenTK; using OpenTK.Graphics; namespace osu.Game.Screens.Edit.Menus { - public class EditorMenuBar : MenuBar + public class EditorMenuBar : OsuMenu { - protected override DrawableMenuBarItem CreateDrawableMenuBarItem(MenuItem item) => new DrawableEditorMenuBarItem(item); - - private class DrawableEditorMenuBarItem : DrawableMenuBarItem + public EditorMenuBar() + : base(Direction.Horizontal) { - private const int fade_duration = 250; - private const float text_size = 14; + AlwaysOpen = true; + RequireClickToOpen = true; - private readonly Container background; + ItemsContainer.Padding = new MarginPadding(0); + BackgroundColour = Color4.Transparent; + } - private Color4 normalColour; + protected override Framework.Graphics.UserInterface.Menu CreateSubMenu() => new SubMenu(); - public DrawableEditorMenuBarItem(MenuItem item) + protected override DrawableMenuItem CreateDrawableMenuItem(MenuItem item) => new DrawableEditorBarMenuItem(item); + + private class DrawableEditorBarMenuItem : DrawableOsuMenuItem + { + private Color4 openedForegroundColour; + private Color4 openedBackgroundColour; + + public DrawableEditorBarMenuItem(MenuItem item) : base(item) { - Text.Padding = new MarginPadding(8); - - AddInternal(background = new Container - { - RelativeSizeAxes = Axes.Both, - Masking = true, - Depth = float.MaxValue, - Alpha = 0, - Child = new Container - { - // The following is done so we can have top rounded corners but not bottom corners - RelativeSizeAxes = Axes.Both, - Height = 2, - Masking = true, - CornerRadius = 5, - Child = new Box { RelativeSizeAxes = Axes.Both } - } - }); - - Menu.OnOpen += menuOpen; - Menu.OnClose += menuClose; } [BackgroundDependencyLoader] private void load(OsuColour colours) { - background.Colour = colours.Gray3; - Text.Colour = normalColour = colours.BlueLight; + ForegroundColour = ForegroundColourHover = colours.BlueLight; + BackgroundColour = BackgroundColourHover = Color4.Transparent; + openedForegroundColour = Color4.White; + openedBackgroundColour = colours.Gray3; } - private void menuOpen() + protected override void UpdateBackgroundColour() { - background.FadeIn(fade_duration, Easing.OutQuint); - Text.FadeColour(Color4.White, fade_duration, Easing.OutQuint); + if (State == MenuItemState.Selected) + Background.FadeColour(openedBackgroundColour); + else + base.UpdateBackgroundColour(); } - private void menuClose() + protected override void UpdateForegroundColour() { - background.FadeOut(fade_duration, Easing.OutQuint); - Text.FadeColour(normalColour, fade_duration, Easing.OutQuint); + if (State == MenuItemState.Selected) + Foreground.FadeColour(openedForegroundColour); + else + base.UpdateForegroundColour(); } - protected override SpriteText CreateText() => new OsuSpriteText { TextSize = text_size }; - - protected override Framework.Graphics.UserInterface.Menu CreateMenu() => new EditorMenu(); - - private class EditorMenu : OsuMenu + protected override Drawable CreateBackground() => new Container { - public EditorMenu() + RelativeSizeAxes = Axes.Both, + Masking = true, + Child = new Container + { + RelativeSizeAxes = Axes.Both, + Height = 2, + Masking = true, + CornerRadius = 4, + Child = new Box { RelativeSizeAxes = Axes.Both } + } + }; + } + + private class SubMenu : OsuMenu + { + public SubMenu() + : base(Direction.Vertical) + { + OriginPosition = new Vector2(5, 1); + ItemsContainer.Padding = new MarginPadding { Top = 5, Bottom = 5 }; + } + + [BackgroundDependencyLoader] + private void load(OsuColour colours) + { + BackgroundColour = colours.Gray3; + } + + protected override Framework.Graphics.UserInterface.Menu CreateSubMenu() => new SubMenu(); + + protected override DrawableMenuItem CreateDrawableMenuItem(MenuItem item) => new DrawableSubMenuItem(item); + + private class DrawableSubMenuItem : DrawableOsuMenuItem + { + public DrawableSubMenuItem(MenuItem item) + : base(item) { - Anchor = Anchor.BottomLeft; - BypassAutoSizeAxes = Axes.Both; - OriginPosition = new Vector2(8, 0); } - [BackgroundDependencyLoader] - private void load(OsuColour colours) + protected override bool OnHover(InputState state) { - BackgroundColour = colours.Gray3; + if (Item is EditorMenuSpacer) + return true; + return base.OnHover(state); } - protected override MarginPadding ItemFlowContainerPadding => new MarginPadding { Top = 5, Bottom = 5 }; - - protected override DrawableMenuItem CreateDrawableMenuItem(MenuItem item) => new DrawableEditorMenuItem(item); - - private class DrawableEditorMenuItem : DrawableOsuMenuItem + protected override bool OnClick(InputState state) { - public override bool HandleInput => !isSpacer; - private readonly bool isSpacer; - - public DrawableEditorMenuItem(MenuItem item) - : base(item) - { - isSpacer = item is EditorMenuSpacer; - } - - [BackgroundDependencyLoader] - private void load(OsuColour colours) - { - BackgroundColour = colours.Gray3; - BackgroundColourHover = colours.Gray2; - } - - protected override TextContainer CreateTextContainer() => new EditorTextContainer(); - - private class EditorTextContainer : TextContainer - { - public EditorTextContainer() - { - BoldText.TextSize = text_size; - NormalText.TextSize = text_size; - } - } + if (Item is EditorMenuSpacer) + return true; + return base.OnClick(state); } } } From b98346c79feddd797cf6a6dc1718c27727a7bf5a Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Thu, 7 Sep 2017 15:32:28 +0900 Subject: [PATCH 11/14] Update framework. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index 3e91706ad5..23d1932eae 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 3e91706ad54609c9477588730b5de7db9d1311f8 +Subproject commit 23d1932eae87a871d65624eac3e6e8deb7e286c2 From 41398f57d65cfb8462f8e646c1453ef4e46b44e4 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 7 Sep 2017 20:36:32 +0900 Subject: [PATCH 12/14] Changes in line with framework --- osu.Game/Graphics/UserInterface/OsuMenu.cs | 4 ++-- osu.Game/Screens/Edit/Menus/EditorMenuBar.cs | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/osu.Game/Graphics/UserInterface/OsuMenu.cs b/osu.Game/Graphics/UserInterface/OsuMenu.cs index 4e23a8939d..3fd5481152 100644 --- a/osu.Game/Graphics/UserInterface/OsuMenu.cs +++ b/osu.Game/Graphics/UserInterface/OsuMenu.cs @@ -18,8 +18,8 @@ namespace osu.Game.Graphics.UserInterface { public class OsuMenu : Menu { - public OsuMenu(Direction direction) - : base(direction) + public OsuMenu(Direction direction, bool topLevelMenu = false) + : base(direction, topLevelMenu) { BackgroundColour = Color4.Black.Opacity(0.5f); diff --git a/osu.Game/Screens/Edit/Menus/EditorMenuBar.cs b/osu.Game/Screens/Edit/Menus/EditorMenuBar.cs index 15610fcebd..24625570a1 100644 --- a/osu.Game/Screens/Edit/Menus/EditorMenuBar.cs +++ b/osu.Game/Screens/Edit/Menus/EditorMenuBar.cs @@ -17,11 +17,8 @@ namespace osu.Game.Screens.Edit.Menus public class EditorMenuBar : OsuMenu { public EditorMenuBar() - : base(Direction.Horizontal) + : base(Direction.Horizontal, true) { - AlwaysOpen = true; - RequireClickToOpen = true; - ItemsContainer.Padding = new MarginPadding(0); BackgroundColour = Color4.Transparent; } From b9bec6a983a48f6e39ccb594effe1bf1dd6a3542 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 7 Sep 2017 23:06:35 +0900 Subject: [PATCH 13/14] CI fixes --- .../Visual/TestCaseEditorMenuBar.cs | 18 +++++----- osu.Game/Screens/Edit/Editor.cs | 34 +++++++++---------- osu.Game/Screens/Edit/Menus/EditorMenuBar.cs | 4 +-- .../Edit/Menus/EditorMenuItemSpacer.cs | 4 +-- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs b/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs index 9ff4f4c591..d04a12501e 100644 --- a/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs +++ b/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs @@ -27,22 +27,22 @@ namespace osu.Desktop.Tests.Visual new EditorMenuItem("Open Difficulty..."), new EditorMenuItem("Save"), new EditorMenuItem("Create a new Difficulty..."), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Revert to Saved"), new EditorMenuItem("Revert to Saved (Full)"), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Test Beatmap"), new EditorMenuItem("Open AiMod"), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Upload Beatmap..."), new EditorMenuItem("Export Package"), new EditorMenuItem("Export Map Package"), new EditorMenuItem("Import from..."), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Open Song Folder"), new EditorMenuItem("Open .osu in Notepad"), new EditorMenuItem("Open .osb in Notepad"), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Exit"), } }, @@ -52,20 +52,20 @@ namespace osu.Desktop.Tests.Visual { new EditorMenuItem("Time Signature"), new EditorMenuItem("Metronome Clicks"), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Add Timing Section"), new EditorMenuItem("Add Inheriting Section"), new EditorMenuItem("Reset Current Section"), new EditorMenuItem("Delete Timing Section"), new EditorMenuItem("Resnap Current Section"), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Timing Setup"), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Resnap All Notes", MenuItemType.Destructive), new EditorMenuItem("Move all notes in time...", MenuItemType.Destructive), new EditorMenuItem("Recalculate Slider Lengths", MenuItemType.Destructive), new EditorMenuItem("Delete All Timing Sections", MenuItemType.Destructive), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Set Current Position as Preview Point"), } }, diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs index 0454609689..be9098e3be 100644 --- a/osu.Game/Screens/Edit/Editor.cs +++ b/osu.Game/Screens/Edit/Editor.cs @@ -52,22 +52,22 @@ namespace osu.Game.Screens.Edit new EditorMenuItem("Open difficulty..."), new EditorMenuItem("Save"), new EditorMenuItem("Create new difficulty..."), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Revert to saved"), new EditorMenuItem("Revert to saved (full"), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Test beatmap"), new EditorMenuItem("Open AiMod"), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Upload Beatmap..."), new EditorMenuItem("Export package"), new EditorMenuItem("Export map package"), new EditorMenuItem("Import from..."), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Open song folder"), new EditorMenuItem("Open .osu in Notepad"), new EditorMenuItem("Open .osb in Notepad"), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Exit", MenuItemType.Standard, Exit) } }, @@ -77,15 +77,15 @@ namespace osu.Game.Screens.Edit { new EditorMenuItem("Undo"), new EditorMenuItem("Redo"), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Cut"), new EditorMenuItem("Copy"), new EditorMenuItem("Paste"), new EditorMenuItem("Delete"), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Select all"), new EditorMenuItem("Clone"), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Reverse selection"), new EditorMenuItem("Flip horizontally"), new EditorMenuItem("Flip vertically"), @@ -93,12 +93,12 @@ namespace osu.Game.Screens.Edit new EditorMenuItem("Rotate 90deg anticlockwise"), new EditorMenuItem("Rotate by..."), new EditorMenuItem("Scale by..."), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Reset selected objects' samples"), new EditorMenuItem("Reset all samples", MenuItemType.Destructive), new EditorMenuItem("Reset combo colours", MenuItemType.Destructive), new EditorMenuItem("Reset breaks", MenuItemType.Destructive), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Nudge backward"), new EditorMenuItem("Nudge forward") } @@ -110,10 +110,10 @@ namespace osu.Game.Screens.Edit new EditorMenuItem("Compose"), new EditorMenuItem("Design"), new EditorMenuItem("Timing"), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Song setup..."), new EditorMenuItem("Timing setup..."), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Volume"), new EditorMenuItem("Grid level"), new EditorMenuItem("Show video"), @@ -131,7 +131,7 @@ namespace osu.Game.Screens.Edit new EditorMenuItem("Snap divisor"), new EditorMenuItem("Audio rate"), new EditorMenuItem("Grid snapping"), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Create polygon cricles..."), new EditorMenuItem("Convert slider to stream"), new EditorMenuItem("Enable live mapping mode"), @@ -151,20 +151,20 @@ namespace osu.Game.Screens.Edit { new EditorMenuItem("Time signature"), new EditorMenuItem("Metronome clicks"), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Add timing section"), new EditorMenuItem("Add inheriting section"), new EditorMenuItem("Reset current section"), new EditorMenuItem("Delete timing section"), new EditorMenuItem("Resnap current section"), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Timing setup..."), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Resnap all notes", MenuItemType.Destructive), new EditorMenuItem("Move all notes in time...", MenuItemType.Destructive), new EditorMenuItem("Recalculate slider lengths", MenuItemType.Destructive), new EditorMenuItem("Delete all timing sections", MenuItemType.Destructive), - new EditorMenuSpacer(), + new EditorMenuItemSpacer(), new EditorMenuItem("Set current position as preview point") } }, diff --git a/osu.Game/Screens/Edit/Menus/EditorMenuBar.cs b/osu.Game/Screens/Edit/Menus/EditorMenuBar.cs index 24625570a1..bb349b1531 100644 --- a/osu.Game/Screens/Edit/Menus/EditorMenuBar.cs +++ b/osu.Game/Screens/Edit/Menus/EditorMenuBar.cs @@ -105,14 +105,14 @@ namespace osu.Game.Screens.Edit.Menus protected override bool OnHover(InputState state) { - if (Item is EditorMenuSpacer) + if (Item is EditorMenuItemSpacer) return true; return base.OnHover(state); } protected override bool OnClick(InputState state) { - if (Item is EditorMenuSpacer) + if (Item is EditorMenuItemSpacer) return true; return base.OnClick(state); } diff --git a/osu.Game/Screens/Edit/Menus/EditorMenuItemSpacer.cs b/osu.Game/Screens/Edit/Menus/EditorMenuItemSpacer.cs index 0e01992846..5060165ef7 100644 --- a/osu.Game/Screens/Edit/Menus/EditorMenuItemSpacer.cs +++ b/osu.Game/Screens/Edit/Menus/EditorMenuItemSpacer.cs @@ -3,9 +3,9 @@ namespace osu.Game.Screens.Edit.Menus { - public class EditorMenuSpacer : EditorMenuItem + public class EditorMenuItemSpacer : EditorMenuItem { - public EditorMenuSpacer() + public EditorMenuItemSpacer() : base(" ") { } From 439cbd09a0a9b84af357151232c9bcb525b81ca2 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 7 Sep 2017 23:23:51 +0900 Subject: [PATCH 14/14] Fix incorrect TestCase type --- osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs b/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs index d04a12501e..9cb3053ff2 100644 --- a/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs +++ b/osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs @@ -2,13 +2,12 @@ // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Graphics; -using osu.Framework.Testing; using osu.Game.Graphics.UserInterface; using osu.Game.Screens.Edit.Menus; namespace osu.Desktop.Tests.Visual { - public class TestCaseEditorMenuBar : TestCase + public class TestCaseEditorMenuBar : OsuTestCase { public TestCaseEditorMenuBar() {