osu-lazer

Fix one more test failure

Bartłomiej Dach · 2025-04-25 08:14:12 +02:00

ae8fb2ce08

Fix code quality

Bartłomiej Dach · 2025-04-24 13:18:35 +02:00

330f213460

Convert gameplay leaderboard to skinnable component

This PR converts the leaderboard into a full-fledged skinnable component
that can be manipulated by users at will.

Notably, this finally allows https://github.com/ppy/osu/issues/20422 to
be fixed - although it's a very mixed bag, for several reasons:

- Because of taiko players' refusal to see reason^W^W^W^Winsistence on
  keeping stable behaviours related to aspect ratio treatment, I have to
  assume the worst case scenario, which means than on typical
  resolutions like 16:9 (or even worse, 4:3), the leaderboard will
  likely not occupy as much vertical space as it probably could.

- Additionally, there's the problem of where to put the spectator list.
  I settled on putting it to the right of the leaderboard, but that's
  kind of janky, because the leaderboard sometimes collapses and
  sometimes fully hides, leading to a very awkward space left behind. If
  we had the capability to anchor elements to other elements, maybe this
  could be resolved, but for now, I'm not sure what to do. I think if
  some users are bothered by it they can move it where they want it. Or
  delete it.

Bartłomiej Dach · 2025-04-24 13:10:30 +02:00

59b826c321

Merge pull request #32937 from bdach/ternary-selection-fixes

Fix multiple issues with editor ternary toggle state management

Dean Herbert · 2025-04-24 19:23:00 +09:00

a0044116f3

Fix deselecting single item from a multiple selection not updating ternary states correctly

I'm not sure why this condition was written this obtusely, but
importantly it was also wrong. It fires when the selection contains
multiple items and only some are removed from it, like when
ctrl-click-unselecting an item from a multiple selection.

Bartłomiej Dach · 2025-04-24 09:25:36 +02:00

5a3ff11710

Reset sample ternary states on deselection

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

Appears to match stable:

	https://github.com/peppy/osu-stable-reference/blob/996648fba06baf4e7d2e0b248959399444017895/osu!/GameModes/Edit/Modes/EditorModeCompose.cs#L4137-L4143
	https://github.com/peppy/osu-stable-reference/blob/996648fba06baf4e7d2e0b248959399444017895/osu!/GameModes/Edit/Modes/EditorModeCompose.cs#L1615-L1618
	https://github.com/peppy/osu-stable-reference/blob/996648fba06baf4e7d2e0b248959399444017895/osu!/GameModes/Edit/Modes/EditorModeCompose.cs#L4323

Bartłomiej Dach · 2025-04-24 09:25:27 +02:00

5c04f427a5

Fix code quality

Bartłomiej Dach · 2025-04-24 08:54:10 +02:00

72dd3513fc

Fix presenting score potentially dying due to deleted beatmap

- Closes https://github.com/ppy/osu/issues/27168
- Closes https://github.com/ppy/osu/issues/32930

It's a little manual (if you perform any of the scenarios in the issues
above on this branch, the first click will re-import the beatmap but not
start the replay, and only the second will play it), but maybe fine?

Bartłomiej Dach · 2025-04-24 08:47:08 +02:00

c52dce0f38

Merge pull request #32922 from peppy/fix-tablet-adjust-precision

Fix tablet settings adjusting with too much precision

Dean Herbert · 2025-04-24 15:23:56 +09:00

4a95973b6e

Merge pull request #32915 from peppy/carousel-update-handling

Add basic support for beatmap updates in `BeatmapCarousel`

Bartłomiej Dach · 2025-04-23 13:10:25 +02:00

7cf8207e6e

Merge pull request #32924 from smoogipoo/fix-mp-results-background

Show true beatmap background when viewing historical multiplayer results

Bartłomiej Dach · 2025-04-23 12:42:00 +02:00

212e7a1170

Move implementation to base class

Dan Balasescu · 2025-04-23 18:27:59 +09:00

655861752d

Merge pull request #32909 from bdach/fix-daily-challenge-marker

Fix daily challenge marker text spacing

Dean Herbert · 2025-04-23 18:24:56 +09:00

0adda23988

Ensure online ID has a valid online value before preferring it

Dean Herbert · 2025-04-23 18:21:17 +09:00

1488a49dae

Remove online ID equality TODO and add explanation as to why it's not required

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

73773aa69a

Maintain selection using OnlineID as a priority

Dean Herbert · 2025-04-23 18:01:49 +09:00

414150e9e0

Merge pull request #32842 from frenzibyte/song-select-v2-wedges-title

Add song select beatmap title wedge

Dean Herbert · 2025-04-23 17:39:03 +09:00

ddb4c0e24f

Merge pull request #32843 from frenzibyte/song-select-v2-wedges-metadata

Add song select beatmap metadata wedge

Dean Herbert · 2025-04-23 17:36:12 +09:00

f945298bde

Fix "mapped by" line showing stupid display when switching to default beatmap

Dean Herbert · 2025-04-23 17:34:59 +09:00

5ad28a792b

Simplify and fix naming of statistic class

Dean Herbert · 2025-04-23 17:32:18 +09:00

4290f2d4fd

Fix animations and alignment of tiny statistics

Dean Herbert · 2025-04-23 17:20:52 +09:00

9372ba02d1

Remove silly bindable flow that only exists for testing purposes

Dean Herbert · 2025-04-23 17:08:48 +09:00

c11220df9b

Improve star rating colour animations to match

Dean Herbert · 2025-04-23 17:04:53 +09:00

f6d7e29396

Define constant for difficulty colour cutoff

Dean Herbert · 2025-04-23 16:57:41 +09:00

3f719125e6

Merge pull request #32923 from smoogipoo/keep-settings-on-room-update

Keep multiplayer settings open during room updates

Bartłomiej Dach · 2025-04-23 09:47:56 +02:00

059f6ef35c

Show true beatmap background when viewing historical multiplayer results

Dan Balasescu · 2025-04-23 16:28:44 +09:00

65cf1a4b7c

Merge pull request #32913 from peppy/leaderboard-fetch-refactor

Remove `LeaderboardManager` return value and simplify flow further

Bartłomiej Dach · 2025-04-23 09:27:12 +02:00

7636573e21

Adjust tests and transitions

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

883df07ff6

Keep multiplayer settings open during room updates

Dan Balasescu · 2025-04-23 16:05:35 +09:00

5ea408f3a1

Fix increased spacing on fps counter tooltip

Bartłomiej Dach · 2025-04-23 08:55:41 +02:00

3f98dd93ed

Fix tablet settings adjusting with too much precision

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

I don't know if there's going to be other cases of breakage, but from
what I can tell these settings *not* showing infinite precision
representations was a bug with the previous implementation of number
formatting.

Dean Herbert · 2025-04-23 15:40:41 +09:00

8d4d9b7bef

Merge pull request #32912 from bdach/free-mod-button-still-clickable-when-disabled

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

Dan Balasescu · 2025-04-23 15:37:55 +09:00

0b694fdef2

Always refresh leaderboard for now

Dean Herbert · 2025-04-23 14:51:00 +09:00

f945abb72e

Remove loading layer

Dean Herbert · 2025-04-23 13:57:36 +09:00

83d2189b4f

Merge branch 'master' into feat/block-users

Dean Herbert · 2025-04-23 13:55:18 +09:00

c5748a0eae

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

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

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

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 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

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

46436 Commits