Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three

osu-framework

@@ -1 +1 @@
-Subproject commit cdb031c3a8ef693cd71458c5e19c68127ab72938
+Subproject commit 9d142a8e009794dfee828392e36025d08577131d

osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs

@@ -55,7 +55,9 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
 
             Beatmap<TaikoHitObject> converted = base.ConvertBeatmap(original);
 
-            // Post processing step to transform hit objects with the same start time into strong hits
+            if (original.BeatmapInfo.RulesetID == 3)
+            {
+                // Post processing step to transform mania hit objects with the same start time into strong hits
                 converted.HitObjects = converted.HitObjects.GroupBy(t => t.StartTime).Select(x =>
                 {
                     TaikoHitObject first = x.First();
@@ -63,6 +65,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                         first.IsStrong = true;
                     return first;
                 }).ToList();
+            }
 
             return converted;
         }

osu.Game/Graphics/UserInterface/OsuTabControl.cs

@@ -59,7 +59,7 @@ namespace osu.Game.Graphics.UserInterface
         public class OsuTabItem : TabItem<T>, IHasAccentColour
         {
             protected readonly SpriteText Text;
-            private readonly Box box;
+            protected readonly Box Bar;
 
             private Color4 accentColour;
             public Color4 AccentColour
@@ -77,13 +77,13 @@ namespace osu.Game.Graphics.UserInterface
 
             private void fadeActive()
             {
-                box.FadeIn(transition_length, Easing.OutQuint);
+                Bar.FadeIn(transition_length, Easing.OutQuint);
                 Text.FadeColour(Color4.White, transition_length, Easing.OutQuint);
             }
 
             private void fadeInactive()
             {
-                box.FadeOut(transition_length, Easing.OutQuint);
+                Bar.FadeOut(transition_length, Easing.OutQuint);
                 Text.FadeColour(AccentColour, transition_length, Easing.OutQuint);
             }
 
@@ -123,7 +123,7 @@ namespace osu.Game.Graphics.UserInterface
                         TextSize = 14,
                         Font = @"Exo2.0-Bold", // Font should only turn bold when active?
                     },
-                    box = new Box
+                    Bar = new Box
                     {
                         RelativeSizeAxes = Axes.X,
                         Height = 1,

osu.Game/Overlays/WaveOverlayContainer.cs

@@ -1,7 +1,6 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework;
 using OpenTK.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics.Containers;
@@ -165,10 +164,8 @@ namespace osu.Game.Overlays
             wavesContainer.Height = Math.Max(0, DrawHeight - (contentContainer.DrawHeight - contentContainer.Y));
         }
 
-        private class Wave : Container, IStateful<Visibility>
+        private class Wave : VisibilityContainer
         {
-            public event Action<Visibility> StateChanged;
-
             public float FinalPosition;
 
             public Wave()
@@ -183,13 +180,7 @@ namespace osu.Game.Overlays
                     Radius = 20f,
                 };
 
-                Children = new Drawable[]
+                Child = new Box { RelativeSizeAxes = Axes.Both };
-                {
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                };
             }
 
             protected override void Update()
@@ -201,28 +192,8 @@ namespace osu.Game.Overlays
                 Height = Parent.Parent.DrawSize.Y * 1.5f;
             }
 
-            private Visibility state;
+            protected override void PopIn() => this.MoveToY(FinalPosition, APPEAR_DURATION, easing_show);
-
+            protected override void PopOut() => this.MoveToY(Parent.Parent.DrawSize.Y, DISAPPEAR_DURATION, easing_hide);
-            public Visibility State
-            {
-                get { return state; }
-                set
-                {
-                    state = value;
-
-                    switch (value)
-                    {
-                        case Visibility.Hidden:
-                            this.MoveToY(Parent.Parent.DrawSize.Y, DISAPPEAR_DURATION, easing_hide);
-                            break;
-                        case Visibility.Visible:
-                            this.MoveToY(FinalPosition, APPEAR_DURATION, easing_show);
-                            break;
-                    }
-
-                    StateChanged?.Invoke(State);
-                }
-            }
         }
     }
 }

osu.Game/Screens/Edit/Editor.cs

@@ -32,16 +32,11 @@ namespace osu.Game.Screens.Edit
                 Height = 40,
                 Children = new Drawable[]
                 {
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = OsuColour.FromHex("111")
-                    },
                     new EditorMenuBar
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
-                        X = 100,
+                        RelativeSizeAxes = Axes.Both,
                         Items = new[]
                         {
                             new EditorMenuBarItem("File")

osu.Game/Screens/Edit/Menus/EditorMenuBar.cs

@@ -19,8 +19,20 @@ namespace osu.Game.Screens.Edit.Menus
         public EditorMenuBar()
             : base(Direction.Horizontal, true)
         {
-            ItemsContainer.Padding = new MarginPadding(0);
+            RelativeSizeAxes = Axes.X;
-            BackgroundColour = Color4.Transparent;
+
+            ItemsContainer.Padding = new MarginPadding { Left = 100 };
+            BackgroundColour = OsuColour.FromHex("111");
+
+            AddRangeInternal(new Drawable[]
+            {
+                new ScreenSelectionTabControl
+                {
+                    Anchor = Anchor.BottomRight,
+                    Origin = Anchor.BottomRight,
+                    X = -15
+                }
+            });
         }
 
         protected override Framework.Graphics.UserInterface.Menu CreateSubMenu() => new SubMenu();
@@ -29,27 +41,35 @@ namespace osu.Game.Screens.Edit.Menus
 
         private class DrawableEditorBarMenuItem : DrawableOsuMenuItem
         {
-            private Color4 openedForegroundColour;
+            private BackgroundBox background;
-            private Color4 openedBackgroundColour;
 
             public DrawableEditorBarMenuItem(MenuItem item)
                 : base(item)
             {
+                Anchor = Anchor.CentreLeft;
+                Origin = Anchor.CentreLeft;
+
+                StateChanged += stateChanged;
             }
 
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
-                ForegroundColour = ForegroundColourHover = colours.BlueLight;
+                ForegroundColour = colours.BlueLight;
-                BackgroundColour = BackgroundColourHover = Color4.Transparent;
+                BackgroundColour = Color4.Transparent;
-                openedForegroundColour = Color4.White;
+                ForegroundColourHover = Color4.White;
-                openedBackgroundColour = colours.Gray3;
+                BackgroundColourHover = colours.Gray3;
+            }
+
+            public override void SetFlowDirection(Direction direction)
+            {
+                AutoSizeAxes = Axes.Both;
             }
 
             protected override void UpdateBackgroundColour()
             {
                 if (State == MenuItemState.Selected)
-                    Background.FadeColour(openedBackgroundColour);
+                    Background.FadeColour(BackgroundColourHover);
                 else
                     base.UpdateBackgroundColour();
             }
@@ -57,26 +77,60 @@ namespace osu.Game.Screens.Edit.Menus
             protected override void UpdateForegroundColour()
             {
                 if (State == MenuItemState.Selected)
-                    Foreground.FadeColour(openedForegroundColour);
+                    Foreground.FadeColour(ForegroundColourHover);
                 else
                     base.UpdateForegroundColour();
             }
 
-            protected override Drawable CreateBackground() => new Container
+            private void stateChanged(MenuItemState newState)
+            {
+                if (newState == MenuItemState.Selected)
+                    background.Expand();
+                else
+                    background.Contract();
+            }
+
+            protected override Drawable CreateBackground() => background = new BackgroundBox();
+            protected override DrawableOsuMenuItem.TextContainer CreateTextContainer() => new TextContainer();
+
+            private new class TextContainer : DrawableOsuMenuItem.TextContainer
+            {
+                public TextContainer()
+                {
+                    NormalText.TextSize = BoldText.TextSize = 14;
+                    NormalText.Margin = BoldText.Margin = new MarginPadding { Horizontal = 10, Vertical = MARGIN_VERTICAL };
+                }
+            }
+
+            private class BackgroundBox : CompositeDrawable
+            {
+                private readonly Container innerBackground;
+
+                public BackgroundBox()
+                {
+                    RelativeSizeAxes = Axes.Both;
+                    Masking = true;
+                    InternalChild = innerBackground = new Container
                     {
                         RelativeSizeAxes = Axes.Both,
                         Masking = true,
-                Child = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Height = 2,
-                    Masking = true,
                         CornerRadius = 4,
                         Child = new Box { RelativeSizeAxes = Axes.Both }
-                }
                     };
                 }
 
+                /// <summary>
+                /// Expands the background such that it doesn't show the bottom corners.
+                /// </summary>
+                public void Expand() => innerBackground.Height = 2;
+
+                /// <summary>
+                /// Contracts the background such that it shows the bottom corners.
+                /// </summary>
+                public void Contract() => innerBackground.Height = 1;
+            }
+        }
+
         private class SubMenu : OsuMenu
         {
             public SubMenu()

osu.Game/Screens/Edit/Menus/ScreenSelectionTabControl.cs

@@ -0,0 +1,85 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using OpenTK.Graphics;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+using OpenTK;
+using System.ComponentModel;
+
+namespace osu.Game.Screens.Edit.Menus
+{
+    public class ScreenSelectionTabControl : OsuTabControl<EditorScreenMode>
+    {
+        public ScreenSelectionTabControl()
+        {
+            AutoSizeAxes = Axes.X;
+            RelativeSizeAxes = Axes.Y;
+
+            TabContainer.RelativeSizeAxes &= ~Axes.X;
+            TabContainer.AutoSizeAxes = Axes.X;
+            TabContainer.Padding = new MarginPadding();
+
+            Add(new Box
+            {
+                Anchor = Anchor.BottomLeft,
+                Origin = Anchor.BottomLeft,
+                RelativeSizeAxes = Axes.X,
+                Height = 1,
+                Colour = Color4.White.Opacity(0.2f),
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            AccentColour = colours.Yellow;
+        }
+
+        protected override Dropdown<EditorScreenMode> CreateDropdown() => null;
+
+        protected override TabItem<EditorScreenMode> CreateTabItem(EditorScreenMode value) => new TabItem(value);
+
+        private class TabItem : OsuTabItem
+        {
+            private const float transition_length = 250;
+
+            public TabItem(EditorScreenMode value)
+                : base(value)
+            {
+                Text.Margin = new MarginPadding();
+                Text.Anchor = Anchor.CentreLeft;
+                Text.Origin = Anchor.CentreLeft;
+            }
+
+            protected override void OnActivated()
+            {
+                base.OnActivated();
+                Bar.ScaleTo(new Vector2(1, 5), transition_length, Easing.OutQuint);
+            }
+
+            protected override void OnDeactivated()
+            {
+                base.OnDeactivated();
+                Bar.ScaleTo(Vector2.One, transition_length, Easing.OutQuint);
+            }
+        }
+    }
+
+    public enum EditorScreenMode
+    {
+        [Description("compose")]
+        Compose,
+        [Description("design")]
+        Design,
+        [Description("timing")]
+        Timing,
+        [Description("song")]
+        SongSetup
+    }
+}

osu.Game/Tests/Visual/TestCaseContextMenu.cs

@@ -9,6 +9,7 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
 using OpenTK;
 using OpenTK.Graphics;
+using osu.Game.Graphics.Cursor;
 
 namespace osu.Game.Tests.Visual
 {
@@ -23,34 +24,34 @@ namespace osu.Game.Tests.Visual
 
         public TestCaseContextMenu()
         {
-            Add(container = new MyContextMenuContainer
+            Add(new OsuContextMenuContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    container = new MyContextMenuContainer
                     {
                         Size = new Vector2(200),
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
-                Children = new Drawable[]
+                        Child = new Box
-                {
-                    new Box
                         {
                             RelativeSizeAxes = Axes.Both,
                             Colour = Color4.Green,
                         }
-                }
+                    },
-            });
+                    new AnotherContextMenuContainer
-
-            Add(new AnotherContextMenuContainer
                     {
                         Size = new Vector2(200),
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
-                Children = new Drawable[]
+                        Child = new Box
-                {
-                    new Box
                         {
                             RelativeSizeAxes = Axes.Both,
                             Colour = Color4.Red,
                         }
                     }
+                }
             });
         }
 

osu.Game/Tests/Visual/TestCaseEditorMenuBar.cs

@@ -1,7 +1,10 @@
 // Copyright (c) 2007-2017 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.Graphics.UserInterface;
 using osu.Game.Screens.Edit.Menus;
 
@@ -9,13 +12,20 @@ namespace osu.Game.Tests.Visual
 {
     public class TestCaseEditorMenuBar : OsuTestCase
     {
+        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(EditorMenuBar), typeof(ScreenSelectionTabControl) };
+
         public TestCaseEditorMenuBar()
         {
-            Add(new EditorMenuBar
+            Add(new Container
             {
                 Anchor = Anchor.TopCentre,
                 Origin = Anchor.TopCentre,
+                RelativeSizeAxes = Axes.X,
+                Height = 50,
                 Y = 50,
+                Child = new EditorMenuBar
+                {
+                    RelativeSizeAxes = Axes.Both,
                     Items = new[]
                     {
                         new EditorMenuBarItem("File")
@@ -78,6 +88,7 @@ namespace osu.Game.Tests.Visual
                             }
                         },
                     }
+                }
             });
         }
     }

osu.Game/osu.Game.csproj

@@ -625,6 +625,7 @@
     <Compile Include="Screens\Edit\Menus\EditorMenuBarItem.cs" />
     <Compile Include="Screens\Edit\Menus\EditorMenuItem.cs" />
     <Compile Include="Screens\Edit\Menus\EditorMenuItemSpacer.cs" />
+    <Compile Include="Screens\Edit\Menus\ScreenSelectionTabControl.cs" />
     <Compile Include="Screens\Loader.cs" />
     <Compile Include="Screens\Menu\Button.cs" />
     <Compile Include="Screens\Menu\ButtonSystem.cs" />