osu-lazer

Fix fps counter test scene being half broken

Bartłomiej Dach · 2025-04-24 15:07:26 +09:00

82d401d097

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-24 15:07:26 +09:00

187481650b

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-24 15:07:19 +09:00

cc6e2a5415

Add failing test

Bartłomiej Dach · 2025-04-24 15:07:19 +09:00

ffcc0f75ff

Minor fix to the description text

Shavixinio · 2025-04-24 15:07:11 +09:00

e5c76b5988

Keep multiplayer settings open during room updates

Dan Balasescu · 2025-04-24 15:07:01 +09:00

c1ae94c0d5

Add failing test

Dan Balasescu · 2025-04-24 15:07:01 +09:00

cc49020e2f

Move implementation to base class

Dan Balasescu · 2025-04-24 15:06:44 +09:00

bdd9e5f68d

Show true beatmap background when viewing historical multiplayer results

Dan Balasescu · 2025-04-24 15:06:41 +09:00

504a7299e3

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

Fix storyboard videos not displaying

Regressed with 102085668f because the
stupid magic alpha transform addition was also implicitly changing the
value of `IsDrawable` from false to true because that property checks
for presence of any commands.

Apparently past me, in his infinite wisdom, did not decide it pertinent
to test that change against, you know, *a beatmap with a storyboard*.
Great job, past me, good show all around.

Bartłomiej Dach · 2025-04-18 14:23:43 +02:00

2761ee005d

Add failing test coverage

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

20b2cc8251

Fix rate adjust no longer showing the rate if custom

"Accidentally" removed in 6e635f124a
apparently.

Bartłomiej Dach · 2025-04-18 14:03:32 +02:00

5791375b38

Merge pull request #32837 from bdach/culture-infoooooooooooOOOOOO

Fix culture variance in new formatting helper

Dean Herbert · 2025-04-18 18:53:50 +09:00

bb30d86401

Fix culture variance in new formatting helper

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

e5636a84f1

Add failing test

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

c28f2a932c

Merge pull request #32820 from peppy/global-audio-offset-control-fixes

Fix global offset adjust control showing adjustment available when it shouldn't

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

2025.418.0 21fd4e857f

Add a test for negative zero (yes, *negative zero*)

Bartłomiej Dach · 2025-04-18 10:55:43 +02:00

62d83cff9a

Move number formatting to extension method and reuse for AudioOffsetAdjustmentControl

Also adds some basic test coverage.

Dean Herbert · 2025-04-18 17:30:31 +09:00

e44b134552

Merge pull request #32836 from peppy/update-framework

Update framework

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

100e439702

Update framework

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

b02ff0f95c

Merge pull request #32810 from bdach/stable-hitwindow-tests

Add test cases covering correct legacy replay playback with respect to hitwindow treatment

Dean Herbert · 2025-04-18 15:31:49 +09:00

a0d84d76d8

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

Fix multiplayer background changing in results screen

Bartłomiej Dach · 2025-04-17 14:16:20 +02:00

0138f78845

Merge pull request #29816 from peppy/no-high-performance-in-results

End high performance session when showing results screen

Bartłomiej Dach · 2025-04-17 14:16:00 +02:00

772f71d275

Fix incorrect assertion message

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

Dan Balasescu · 2025-04-17 20:05:34 +09:00

47d943afd7

Merge pull request #32830 from bdach/refuse-to-import-replays-with-dodgy-mods

Refuse to import scores specifying incompatible mods

Dean Herbert · 2025-04-17 19:57:01 +09:00

df1411fc08

Merge pull request #32829 from peppy/fix-mania-beatmap-corruption-update-background

Fix osu!mania beatmap objects getting corrupted when updating beatmap background

Bartłomiej Dach · 2025-04-17 12:31:44 +02:00

b2855ce57d

Adjust PlayerLoader logic to avoid threading safety requirements

Dean Herbert · 2025-04-17 19:21:33 +09:00

708d9ae1b0

Merge branch 'master' into stable-hitwindow-tests

Bartłomiej Dach · 2025-04-17 11:40:50 +02:00

2eb3bfa232

Fix garbage data in test case

Bartłomiej Dach · 2025-04-17 11:37:28 +02:00

5f4afe156f

Merge pull request #32770 from bdach/replay-stability-tests

Add test cases for lazer-specific replay instability due to truncation issue

Dean Herbert · 2025-04-17 18:33:27 +09:00

66802d2a97

Add theoretically-valid-but-practically-not commented-out test cases

Bartłomiej Dach · 2025-04-17 10:36:04 +02:00

a82bb5c2f6

Refuse to import scores specifying incompatible mods

Supersedes https://github.com/ppy/osu/pull/32817.

The messaging of the failure to the user is maybe not the cleanest, but
I'm not sure it's worth putting time in to improve it?

Bartłomiej Dach · 2025-04-17 10:10:07 +02:00

485c3e8e53

Add failing test

Bartłomiej Dach · 2025-04-17 10:05:57 +02:00

1fad2a8f2c

Centralise calls to end high performance sessions

Dean Herbert · 2025-04-17 16:55:33 +09:00

a15230eba1

End high performance session when showing results screen

Dean Herbert · 2025-04-17 16:54:45 +09:00

67c6f8acdd

Fix osu!mania beatmap objects getting corrupted when updating beatmap background

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

Tested manually to fix the issue. Setting up test coverage for this is
going to likely take over an hour compared to the 30 second fix, so
please advise if required. I couldn't find any existing tests which
perform this flow.

Dean Herbert · 2025-04-17 16:11:03 +09:00

b71281bec8

Fix multiplayer background changing in results screen

Dan Balasescu · 2025-04-17 03:30:55 +09:00

6052fbb4f9

Add failing test

Dan Balasescu · 2025-04-17 03:30:55 +09:00

1a68edfa58

Merge pull request #32819 from peppy/song-select-v2-unrelated-changes

Apply various minor refactors (split out from song select v2 ongoing work)

Bartłomiej Dach · 2025-04-16 14:54:53 +02:00

81fb058c9a

Fix global offset adjust control showing adjustment available when it shouldn't

Audio offset is integer based in configuration, so let's make sure not
to show that there's an applicable offset when the value difference is
too low.

I've also fixed rounding to match expectations (`AudioOffset` is
precision limited to integer), and handled the case where a user adjusts
the slider but also has a suggested offset – previously it would not
enable the button after slider adjustments but now it will work as
expected.

Dean Herbert · 2025-04-16 20:21:50 +09:00

51ad6289ca

Add animated fade when online status pill has an unknown status

Dean Herbert · 2025-04-16 19:41:50 +09:00

07d0c7443c

Disable masking of Carousel

The default for carousels should be unmasked as their usage generally
sees them overflowing outside their main usage area (see `bleed`
variables).

Dean Herbert · 2025-04-16 19:41:49 +09:00

376b4e8929

Add global screen margin for new screen designs

Dean Herbert · 2025-04-16 19:41:49 +09:00

1cca936e28

Avoid adding arbitrary background in SongSelectComponentsTestScene

Dean Herbert · 2025-04-16 19:41:49 +09:00

4c1f4a512c

72842 Commits