h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 08:12:56 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into osu-performance

Browse Source
This commit is contained in:
Dean Herbert 2024-03-12 14:04:56 +08:00 committed by GitHub
commit 45f9d722a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 20 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Online/Notifications/WebSocket/Events/UserAchievementUnlock.cs
View File

@ -14,7 +14,7 @@ namespace osu.Game.Online.Notifications.WebSocket.Events
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;

1
osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
View File

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

44
osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
View File

@ -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 @@ namespace osu.Game.Overlays.BeatmapListing
{
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 @@ namespace osu.Game.Overlays.BeatmapListing
{
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 @@ namespace osu.Game.Overlays.BeatmapListing
}
}
[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,
};
}
}
}

4
osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
View File

@ -52,10 +52,8 @@ namespace osu.Game.Overlays.BeatmapListing
[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));

2
osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
View File

@ -33,8 +33,6 @@ namespace osu.Game.Overlays.BeatmapListing
private void load()
{
AutoSizeAxes = Axes.Both;
Anchor = Anchor.BottomLeft;
Origin = Anchor.BottomLeft;
AddRangeInternal(new Drawable[]
{
text = new OsuSpriteText

6
osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
View File

@ -471,6 +471,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
/// </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);