Merge branch 'master' into osu-performance

ppy · Mar 12, 2024 · 45f9d72 · 45f9d72
2 parents e0f1f70 + 301750f
commit 45f9d72
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 39 deletions.
diff --git a/osu.Game/Online/Notifications/WebSocket/Events/UserAchievementUnlock.cs b/osu.Game/Online/Notifications/WebSocket/Events/UserAchievementUnlock.cs
@@ -14,7 +14,7 @@ public class UserAchievementUnlock
         public uint AchievementId { get; set; }
 
         [JsonProperty("achievement_mode")]
-        public ushort? AchievementMode { get; set; }
+        public string? AchievementMode { get; set; }
 
         [JsonProperty("cover_url")]
         public string CoverUrl { get; set; } = string.Empty;

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -128,6 +128,7 @@ public BeatmapListingSearchControl()
                                 RelativeSizeAxes = Axes.X,
                                 Direction = FillDirection.Vertical,
                                 Padding = new MarginPadding { Horizontal = 10 },
+                                Spacing = new Vector2(5),
                                 Children = new Drawable[]
                                 {
                                     generalFilter = new BeatmapSearchGeneralFilterRow(),

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
@@ -1,17 +1,15 @@
 // 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.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osuTK;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Localisation;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.BeatmapListing
 {
@@ -47,11 +45,10 @@ public BeatmapSearchFilterRow(LocalisableString header)
                 {
                     new[]
                     {
-                        new OsuSpriteText
+                        new OsuTextFlowContainer(t => t.Font = OsuFont.GetFont(size: 13))
                         {
-                            Anchor = Anchor.BottomLeft,
-                            Origin = Anchor.BottomLeft,
-                            Font = OsuFont.GetFont(size: 13),
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
                             Text = header
                         },
                         filter = CreateFilter()
@@ -69,10 +66,8 @@ protected partial class BeatmapSearchFilter : TabControl<T>
         {
             public BeatmapSearchFilter()
             {
-                Anchor = Anchor.BottomLeft;
-                Origin = Anchor.BottomLeft;
                 RelativeSizeAxes = Axes.X;
-                Height = 15;
+                AutoSizeAxes = Axes.Y;
 
                 TabContainer.Spacing = new Vector2(10, 0);
 
@@ -83,33 +78,16 @@ public BeatmapSearchFilter()
                 }
             }
 
-            [BackgroundDependencyLoader]
-            private void load(OverlayColourProvider colourProvider)
-            {
-                if (Dropdown is FilterDropdown fd)
-                    fd.AccentColour = colourProvider.Light2;
-            }
-
-            protected override Dropdown<T> CreateDropdown() => new FilterDropdown();
+            protected override Dropdown<T> CreateDropdown() => null!;
 
             protected override TabItem<T> CreateTabItem(T value) => new FilterTabItem<T>(value);
 
-            private partial class FilterDropdown : OsuTabDropdown<T>
+            protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
             {
-                protected override DropdownHeader CreateHeader() => new FilterHeader
-                {
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight
-                };
-
-                private partial class FilterHeader : OsuTabDropdownHeader
-                {
-                    public FilterHeader()
-                    {
-                        Background.Height = 1;
-                    }
-                }
-            }
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                AllowMultiline = true,
+            };
         }
     }
 }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
@@ -52,10 +52,8 @@ protected partial class MultipleSelectionFilter : FillFlowContainer<MultipleSele
             [BackgroundDependencyLoader]
             private void load()
             {
-                Anchor = Anchor.BottomLeft;
-                Origin = Anchor.BottomLeft;
                 RelativeSizeAxes = Axes.X;
-                Height = 15;
+                AutoSizeAxes = Axes.Y;
                 Spacing = new Vector2(10, 0);
 
                 AddRange(GetValues().Select(CreateTabItem));

diff --git a/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs b/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
@@ -33,8 +33,6 @@ public FilterTabItem(T value)
         private void load()
         {
             AutoSizeAxes = Axes.Both;
-            Anchor = Anchor.BottomLeft;
-            Origin = Anchor.BottomLeft;
             AddRangeInternal(new Drawable[]
             {
                 text = new OsuSpriteText

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -471,6 +471,12 @@ private void load(OsuColour colours)
         /// </summary>
         public partial class ExtendableCircle : CompositeDrawable
         {
+            public new ColourInfo Colour
+            {
+                get => Content.Colour;
+                set => Content.Colour = value;
+            }
+
             protected readonly Circle Content;
 
             public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Content.ReceivePositionalInputAt(screenSpacePos);