Merge remote-tracking branch 'upstream/master' into infrastructure

osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteNoteSelectionBlueprint.cs

@@ -0,0 +1,45 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Mania.Edit.Blueprints
+{
+    public class HoldNoteNoteSelectionBlueprint : ManiaSelectionBlueprint
+    {
+        protected new DrawableHoldNote DrawableObject => (DrawableHoldNote)base.DrawableObject;
+
+        private readonly HoldNotePosition position;
+
+        public HoldNoteNoteSelectionBlueprint(DrawableHoldNote holdNote, HoldNotePosition position)
+            : base(holdNote)
+        {
+            this.position = position;
+            InternalChild = new EditNotePiece { RelativeSizeAxes = Axes.X };
+
+            Select();
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            // Todo: This shouldn't exist, mania should not reference the drawable hitobject directly.
+            if (DrawableObject.IsLoaded)
+            {
+                DrawableNote note = position == HoldNotePosition.Start ? DrawableObject.Head : DrawableObject.Tail;
+
+                Anchor = note.Anchor;
+                Origin = note.Origin;
+
+                Size = note.DrawSize;
+                Position = note.DrawPosition;
+            }
+        }
+
+        // Todo: This is temporary, since the note masks don't do anything special yet. In the future they will handle input.
+        public override bool HandlePositionalInput => false;
+    }
+}

osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePosition.cs

@@ -0,0 +1,11 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Rulesets.Mania.Edit.Blueprints
+{
+    public enum HoldNotePosition
+    {
+        Start,
+        End
+    }
+}

osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs

@@ -40,8 +40,8 @@ protected override void LoadComplete()
 
             InternalChildren = new Drawable[]
             {
-                new HoldNoteNoteSelectionBlueprint(DrawableObject.Head),
+                new HoldNoteNoteSelectionBlueprint(DrawableObject, HoldNotePosition.Start),
-                new HoldNoteNoteSelectionBlueprint(DrawableObject.Tail),
+                new HoldNoteNoteSelectionBlueprint(DrawableObject, HoldNotePosition.End),
                 new BodyPiece
                 {
                     AccentColour = Color4.Transparent,
@@ -54,37 +54,19 @@ protected override void Update()
         {
             base.Update();
 
-            Size = DrawableObject.DrawSize + new Vector2(0, DrawableObject.Tail.DrawHeight);
+            // Todo: This shouldn't exist, mania should not reference the drawable hitobject directly.
+            if (DrawableObject.IsLoaded)
+            {
+                Size = DrawableObject.DrawSize + new Vector2(0, DrawableObject.Tail.DrawHeight);
 
-            // This is a side-effect of not matching the hitobject's anchors/origins, which is kinda hard to do
+                // This is a side-effect of not matching the hitobject's anchors/origins, which is kinda hard to do
-            // When scrolling upwards our origin is already at the top of the head note (which is the intended location),
+                // When scrolling upwards our origin is already at the top of the head note (which is the intended location),
-            // but when scrolling downwards our origin is at the _bottom_ of the tail note (where we need to be at the _top_ of the tail note)
+                // but when scrolling downwards our origin is at the _bottom_ of the tail note (where we need to be at the _top_ of the tail note)
-            if (direction.Value == ScrollingDirection.Down)
+                if (direction.Value == ScrollingDirection.Down)
-                Y -= DrawableObject.Tail.DrawHeight;
+                    Y -= DrawableObject.Tail.DrawHeight;
+            }
         }
 
         public override Quad SelectionQuad => ScreenSpaceDrawQuad;
-
-        private class HoldNoteNoteSelectionBlueprint : NoteSelectionBlueprint
-        {
-            public HoldNoteNoteSelectionBlueprint(DrawableNote note)
-                : base(note)
-            {
-                Select();
-            }
-
-            protected override void Update()
-            {
-                base.Update();
-
-                Anchor = DrawableObject.Anchor;
-                Origin = DrawableObject.Origin;
-
-                Position = DrawableObject.DrawPosition;
-            }
-
-            // Todo: This is temporary, since the note masks don't do anything special yet. In the future they will handle input.
-            public override bool HandlePositionalInput => false;
-        }
     }
 }

osu.Game.Rulesets.Mania/Edit/Blueprints/NoteSelectionBlueprint.cs

@@ -19,7 +19,9 @@ protected override void Update()
         {
             base.Update();
 
-            Size = DrawableObject.DrawSize;
+            // Todo: This shouldn't exist, mania should not reference the drawable hitobject directly.
+            if (DrawableObject.IsLoaded)
+                Size = DrawableObject.DrawSize;
         }
     }
 }

osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs

@@ -18,8 +18,6 @@ namespace osu.Game.Overlays.Toolbar
 {
     public class ToolbarRulesetSelector : RulesetSelector
     {
-        private const float padding = 10;
-
         protected Drawable ModeButtonLine { get; private set; }
 
         public ToolbarRulesetSelector()
@@ -39,7 +37,7 @@ private void load()
                 },
                 ModeButtonLine = new Container
                 {
-                    Size = new Vector2(padding * 2 + ToolbarButton.WIDTH, 3),
+                    Size = new Vector2(ToolbarButton.WIDTH, 3),
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.TopLeft,
                     Masking = true,
@@ -91,7 +89,6 @@ private void moveLineToCurrent() => ScheduleAfterChildren(() =>
             RelativeSizeAxes = Axes.Y,
             AutoSizeAxes = Axes.X,
             Direction = FillDirection.Horizontal,
-            Padding = new MarginPadding { Left = padding, Right = padding },
         };
 
         protected override bool OnKeyDown(KeyDownEvent e)