osu-lazer

Apply suggestions from code review

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>

Dean Herbert · 2025-04-23 13:37:45 +09:00

a6921ad566

Minor fix to the description text

Shavixinio · 2025-04-22 19:49:34 +02:00

3b2382ceb0

Ensure selection is retained over beatmap update

Dean Herbert · 2025-04-22 21:01:56 +09:00

615c7b29b5

Simplify even further by removing all of the superfluous task completion sources

Bartłomiej Dach · 2025-04-22 13:28:42 +02:00

4979dd86af

Add basic support for beatmap updates in BeatmapCarousel

Dean Herbert · 2025-04-22 20:03:07 +09:00

6f97667889

Change equality to allow non-reference comparisons

This is required to hold selection when beatmaps are updates, as one
important case.

Dean Herbert · 2025-04-22 20:03:07 +09:00

ac67473433

Add test coverage of carousel update scenarios

Dean Herbert · 2025-04-22 20:03:06 +09:00

3472b6af91

Remove LeaderboardManager return value and simplify flow further

The rationale for this change is that the return value was mostly
useless, and at worst, misleading.

When using `LeaderboardManager`, it's assumed that a consumer will bind
to the global `Scores` list to ensure they receive updates for things
like local score changes via the internal realm subscription. If one
decides to instead use the return value of the task, it will be a static
snapshot that potentially becomes stale in the future.

I fell into this trap when refactoring the new leaderboard component
(while attempting to assert correctness that the values we are
displaying were in fact from the fetch operation we requested).

In the interest of keeping things simple, removing the return value
seems to be the best path forward.

Dean Herbert · 2025-04-22 19:31:02 +09:00

f7d1809cb7

Avoid clearing global cache on entering song select

Dean Herbert · 2025-04-22 19:29:09 +09:00

7e6e082bac

Don't animate on initial mode display

This removes a lot of movement, but honestly it didn't feel good in the
first place. If anything I'll come back with a second-pass animation
pass on this.

Dean Herbert · 2025-04-22 18:42:22 +09:00

8bf95ca3a8

Make leaderbaord animation barely bareable

Dean Herbert · 2025-04-22 18:30:05 +09:00

de821005dc

Fix free mod selection sub-button being clickable even if the main button isn't

Noticed in passing when testing https://github.com/ppy/osu/pull/32674.

Bartłomiej Dach · 2025-04-22 11:25:09 +02:00

fea1b73c17

Add failing test

Bartłomiej Dach · 2025-04-22 11:23:04 +02:00

57e693e0c7

Fix non-sheared test showing sheared drawables

Dean Herbert · 2025-04-22 18:04:41 +09:00

26f2703688

Seal BeatmapLeaderboardScore for now

We'll need to figure out what to do in multiplayer cases in the future,
but the hope is that it can be done without further subclassing if
possible.

Dean Herbert · 2025-04-22 18:01:12 +09:00

bec2d62a7a

Fix regression from copy waste

Dean Herbert · 2025-04-22 17:44:57 +09:00

7a18a771b3

Merge branch 'master' into song-select-v2-wedges-title

Dean Herbert · 2025-04-22 17:35:01 +09:00

ace5f26c0f

Merge branch 'master' into song-select-v2-wedges-metadata

Dean Herbert · 2025-04-22 17:34:57 +09:00

35d01ad124

Merge branch 'master' into song-select-v2-wedges-leaderboard

Dean Herbert · 2025-04-22 17:34:54 +09:00

90f711d12b

Merge pull request #32849 from frenzibyte/song-select-v2-collection-dropdown

Add sheared collection dropdown

Dean Herbert · 2025-04-22 17:31:01 +09:00

bb5c8c85d7

Make mod preset shear buttons take up full width

Dean Herbert · 2025-04-22 17:30:03 +09:00

5e06b3d1b4

Add padding around footer content to avoid sheared overflow

Dean Herbert · 2025-04-22 17:19:16 +09:00

066b036466

Adjust namespaces and naming

Dean Herbert · 2025-04-22 17:03:28 +09:00

ec854f7b7f

Merge pull request #32841 from frenzibyte/song-select-v2-shear-aligning-wrapper

Add shear-aligning drawable wrapper

Dean Herbert · 2025-04-22 16:43:35 +09:00

4bc6b9b3a2

Merge pull request #32840 from frenzibyte/song-select-v2-constants

Prerequisite changes for song select v2 design work

Dean Herbert · 2025-04-22 16:39:05 +09:00

a0698be6c2

Merge pull request #32839 from frenzibyte/song-select-v2-panel-metrics

Use new font specifications in beatmap panels and apply minor adjustments

Dean Herbert · 2025-04-22 16:35:11 +09:00

3ba3f3ace7

Fix daily challenge marker text spacing

Closes https://github.com/ppy/osu/issues/32908.

Have you ever been in a situation wherein you find out you fixed a bug
that you didn't know existed, but that makes *another* bug appear
because it was relying on the other bug? This is where I'm at right now.

But, to start from the top.

`TextFlowContainer.Text` (the setter) is a convenience property that you
use to set the text in one go. Internally it uses `AddText()`:

	https://github.com/ppy/osu-framework/blob/681900ffb70adfeede4e3fa32a69da66252691ee/osu.Framework/Graphics/Containers/TextFlowContainer.cs#L81-L94

`AddText()`'s xmldoc says:

	The \n character will create a new paragraph, not just a line break.
	If you need \n to be a line break, use <see cref="AddParagraph{TSpriteText}(LocalisableString, Action{TSpriteText})"/> instead.

	https://github.com/ppy/osu-framework/blob/681900ffb70adfeede4e3fa32a69da66252691ee/osu.Framework/Graphics/Containers/TextFlowContainer.cs#L226-L239

That's right. This portion of xmldoc was *straight up false* and
*silently broken* before https://github.com/ppy/osu-framework/pull/6556.
If you want to check that out yourself, apply the following patch to
framework:

diff --git a/osu.Framework.Tests/Visual/Containers/TestSceneTextFlowContainer.cs b/osu.Framework.Tests/Visual/Containers/TestSceneTextFlowContainer.cs
index 464f47c2c..e1ad521a7 100644
--- a/osu.Framework.Tests/Visual/Containers/TestSceneTextFlowContainer.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestSceneTextFlowContainer.cs
@@ -180,6 +180,22 @@ public void TestAlignmentIsCorrectWhenLineBreaksAtLastWordOfParagraph(Anchor tex
             });
         }

+        [Test]
+        public void TestSetTextWithNewLine()
+        {
+            AddStep("set text", () => textContainer.Text = "this text\nhas a newline");
+            AddStep("clear and add text", () =>
+            {
+                textContainer.Clear();
+                textContainer.AddText("this text\nhas a newline");
+            });
+            AddStep("clear and add paragraph", () =>
+            {
+                textContainer.Clear();
+                textContainer.AddParagraph("this text\nhas a newline");
+            });
+        }
+
         private void assertSpriteTextCount(int count)
             => AddAssert($"text flow has {count} sprite texts", () => textContainer.ChildrenOfType<SpriteText>().Count() == count);

On `master`, there will be a difference between the first two steps, and
the third. On 2025.321.0, *there will be none*.

My working theory as to why this was always busted is that the
corresponding code that was there before in

	https://github.com/bdach/osu-framework/blob/c31a48178889ca2f9b4d257d2d64915eee90338a/osu.Framework/Graphics/Containers/TextFlowContainer.cs#L454-L458

just straight up ran too late. *The height of the container is being
changed after the flow has laid itself out, without adjusting subsequent
children in any way.*

There is potentially a discussion to be had as to whether the emergent
behaviour of `TextFlowContainer.Text` with respect to `\n` character is
correct, but I'm just going to start with this diff and see what the
reaction is.

Bartłomiej Dach · 2025-04-22 08:52:01 +02:00

5895a8ac49

Merge pull request #32894 from bdach/editor-slider-arrow-hit-markers

Fix slider repeat arrows appearing too early in editor when hit markers are enabled

Dean Herbert · 2025-04-22 03:21:40 +09:00

e03b7ea383

Merge pull request #32822 from bdach/leaderboards/gameplay-provider

Separate gameplay leaderboard data management from display

Dean Herbert · 2025-04-22 03:10:53 +09:00

178063f79e

Update resources

Dean Herbert · 2025-04-22 03:00:37 +09:00

cb807c3c24

Merge pull request #32838 from peppy/carousel-group-counts

Add accounting of nested group items for group panel display purposes

Bartłomiej Dach · 2025-04-21 14:05:21 +02:00

930c56e713

Add test coverage for osu! hit windows with various mods active

Bartłomiej Dach · 2025-04-21 12:54:26 +02:00

cff16ed029

Merge branch 'master' into leaderboards/gameplay-provider

Dean Herbert · 2025-04-21 19:46:54 +09:00

61eaa3e197

Add test coverage for taiko hit windows with various mods active

Bartłomiej Dach · 2025-04-21 12:33:49 +02:00

1736f2d056

Add test coverage for mania hit windows with various mods active

Bartłomiej Dach · 2025-04-21 12:26:09 +02:00

a46a1f569b

Merge pull request #32884 from SchiavoAnto/32878-slider-tooltip-text

Fix slider tooltip text not updating with current value

Bartłomiej Dach · 2025-04-21 11:21:29 +02:00

202346e2b4

Fix slider repeat arrows appearing too early in editor when hit markers are enabled

Closes https://github.com/ppy/osu/issues/32880

Broke in conjunction with https://github.com/ppy/osu/pull/32638 because
of transforms not being applied to `DrawableSliderRepeat` but its
individual pieces instead.

In cross-checking with stable (visual only) the early fade in of the
arrow should still apply, it just shouldn't be instantaneous as is
currently ends up being with how the code is structured.

Bartłomiej Dach · 2025-04-21 10:00:22 +02:00

78d9bd7fb4

Merge pull request #32893 from bdach/temp-replay-leaderboards-fix

Allow toggling leaderboard visibility in replays

Dean Herbert · 2025-04-21 16:27:37 +09:00

834d63d1de

Bring back reading from config value

Bartłomiej Dach · 2025-04-21 09:15:44 +02:00

da1fc1013e

Move bindable list population to load complete to fix threading woes

Bartłomiej Dach · 2025-04-21 09:05:54 +02:00

4d08c81e8d

Merge branch 'master' into leaderboards/gameplay-provider

Bartłomiej Dach · 2025-04-21 09:03:24 +02:00

6b0567e882

Allow toggling leaderboard visibility in replays

Closes https://github.com/ppy/osu/issues/31744 I guess.

This isn't the resolution that I had in mind for this but my hand has
been basically forced by user feedback to do this, at least in the
short-term.

Bartłomiej Dach · 2025-04-21 08:51:34 +02:00

d8df499e72

Fix slider tooltip text not updating with current value

schiavoanto · 2025-04-20 09:43:45 +02:00

267dccdd9a

Update framework

Dean Herbert · 2025-04-20 00:11:26 +09:00

2025.420.0 99e882bfbc

Merge pull request #32863 from bdach/leaderboard-manager-handles-errors

Fix gameplay leaderboard showing scores from wrong beatmaps

Dean Herbert · 2025-04-19 22:55:00 +09:00

b9afecea7f

Merge pull request #32874 from SchiavoAnto/32865-delete-difficulty-red

Change "Delete Difficulty" editor menu item type to destructive

Dean Herbert · 2025-04-19 21:37:52 +09:00

befae5f988

Change "Delete Difficulty" editor menu item type to destructive

schiavoanto · 2025-04-19 09:00:53 +02:00

d1f7afc8ed

Fix gameplay leaderboard showing scores from wrong beatmaps

Kind of a big oversight this. In wanting to get the leaderboard
refactors to move forward I sort of didn't realise the fact that all of
the error handling related to online status and such in
`BeatmapLeaderboard` kind of... can't stay there...

It's also an all-or-nothing business too - moving this stuff can't
really be done only in part.

Not sure whether tests are warranted if it's more or less moving logic
across?

Bartłomiej Dach · 2025-04-18 20:37:02 +02:00

c29f59fcdb

Merge pull request #32853 from bdach/video-machine-broke

Fix storyboard videos not displaying

Dean Herbert · 2025-04-18 22:03:34 +09:00

2025.418.1 d62b1d7c25

Implement score fetch functionality

Copied logic from `BeatmapLeaderboard`.

Salman Alshamrani · 2025-04-18 08:54:55 -04:00

81d54a9f32

75266 Commits