osu-lazer

Refactor ShearedButton to allow easier relative sizing (#36802 )

This commit rearranges the contents of `ShearedButtons` to be more
independent of each other in regards to sizing. Thanks to that, the
custom logic related to enabling autosizing is no longer necessary.
Witdh and height are no longer set via the constructor, and can be
freely configured using the initializer syntax.

Additionally, this allows the button to use relative sizing without
having to resort to any hackery with `Size` (this will come in handy for
me when implementing the new footer on multiplayer screens).

Given that most of the `ShearedButton`s currently in use set their width
explicitly, I did not set `AutoSizeAxes = Axes.X` like it would be by
default previously. Instead it is set on the only two such buttons (show
converts/selected mods on ssv2). I suppose it might be a good idea to
have it set that by default if no `Width` is specified, as right now
it'll just not show anything.

Also I've set the margin on the text field by default in all cases
instead of only when autosizing like how it was previously, since
otherwise it would be a pain to set that on each button instance when
needed. I've checked all affected components and could not find any text
overflowing issues that this could cause.

---------

Co-authored-by: Dean Herbert <pe@ppy.sh>

Krzysztof Gutkowski · 2026-03-06 02:09:05 +09:00

b76a7e1bb6

Merge branch 'master' into song-select-v1-salute

Bartłomiej Dach · 2026-03-04 08:39:58 +01:00

f74a21c1e1

Merge pull request #36795 from peppy/carousel-scrollbar-state-capture

Fix song select carousel state capture

Bartłomiej Dach · 2026-03-03 10:40:25 +01:00

d748470754

Remove all song select v1 files

This contains no code changes (that would need review), only file
deletion and extraction where required in a few odd cases.

Dean Herbert · 2026-03-03 16:45:14 +09:00

1a8d2855d4

Fix song select carousel state capture

Closes #36776.

Dean Herbert · 2026-03-03 15:36:46 +09:00

b0759ff34d

Fix custom tooltip formats no longer displaying in settings

Closes #36793.

Dean Herbert · 2026-03-03 12:59:23 +09:00

ee9f8d5e92

Fix song select navigation with page up/down (#36293 )

Resolves #36099 

This PR fixes keyboard navigation in the beatmap select carousel for
lazer by implementing page-wise traversal with the Page Up and Page Down
keys and changing it from only scrolling to actually selecting items.

**Changes:**
- Added handling for `TraversalType.Page` in the keyboard traversal
switch.
- Implemented `traverseKeyboardPage(int direction)` method to move the
selection by approximately one "page" of visible items, accounting for
partially obscured items like the search bar. Also it does not wrap
around (like the current PageUp/Down functionality).
- Added new key bindings:
    - `PageUp` → SelectPreviousPage
    - `PageDown` → SelectNextPage

The code may be very explicit for the scroll logic with the page keys,
so I would appreciate some feedback when the PR is reviewed.
The naming of the keybinds may need to be adjusted. `Next page` and
`previous page` may be somewhat misleading.

**Behavior after the change:**
- Pressing Page Up/Down now moves the selection by a page of items.
- After navigating, pressing Left/Right selects the navigated song
instead of moving relative to the previous position.

**See:**
https://www.youtube.com/watch?v=JXmKAhhKiCc

---------

Signed-off-by: Linus Genz <linuslinuxgenz@gmail.com>
Co-authored-by: Dean Herbert <pe@ppy.sh>

Linus Genz · 2026-03-02 02:08:19 +09:00

033e13cb3b

Add ability for LoadingLayer to block all keyboard input

Dean Herbert · 2026-02-18 20:01:38 +09:00

83587e2265

Fix revert to default button not resizing correctly after changing languages

Closes #36519.

Dean Herbert · 2026-02-03 18:17:53 +09:00

b8b6327624

Add localisation support for DirectorySelector (#36371 )

- depends on https://github.com/ppy/osu-framework/pull/6700
- closes https://github.com/ppy/osu/issues/36340
- supersedes and closes https://github.com/ppy/osu/pull/36352

<img width="676" height="451" alt="image"
src="https://github.com/user-attachments/assets/4f11c761-175b-495a-8b24-16fb6c481a15"
/>

---------

Co-authored-by: Dean Herbert <pe@ppy.sh>

Denis Titovets · 2026-01-29 19:13:02 +09:00

14d8cf7275

Fix some text boxes no longer having borders (#36526 )

Regressed in d6bf4fd90d.

One very visible instance of this regression is the login form.


https://github.com/user-attachments/assets/5ba10ac5-4cb1-49af-b55c-89cf58ca0b44

The `CommentEditor` usage was discovered with one of my favourite tricks
which is doing

```diff
diff --git a/osu.Game/Graphics/UserInterface/OsuTextBox.cs b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
index fefe776b01..c17cca726b 100644
--- a/osu.Game/Graphics/UserInterface/OsuTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
@@ -42,6 +42,12 @@ public partial class OsuTextBox : BasicTextBox
             Margin = new MarginPadding { Left = 2 },
         };
 
+        public new bool Masking
+        {
+            get => base.Masking;
+            set => base.Masking = value;
+        }
+
         protected bool DrawBorder { get; init; } = true;
 
         private OsuCaret? caret;

```

and then looking for usages of the setter. That's all due diligence
you're getting here, I'm not auditing every single text box in the game.

And yes, the `CommentEditor` usage is OMEGA dodgy but the change applied
here is the only one that preserves its visual appearance. I'm not
putting in time to fix it.

Bartłomiej Dach · 2026-01-29 19:11:10 +09:00

7d476b4b7c

Fix FormCheckbox playing sounds twice

This removes the disabled sound, but I think that's fine. If we want
that, it should be handled by `HoverClickSounds` (which I'm currently
intentionally not using because it can be a bit noisy).

Closes #36503.

Dean Herbert · 2026-01-28 16:55:43 +09:00

7b7777bb56

Fix dropdown margins and animations being weird

This was attempted to be fixed by frenzibyte using some hack workaround
logic, but this is the true fix.

Things were never matching due to `UpdateSize` spamming `Resize`
transforms every frame, causing the fade out to complete before
transforms have reached a final state.

Dean Herbert · 2026-01-28 14:22:41 +09:00

6bdb0e1cbb

Remove workaround for dropdowns animating weirdly

Dean Herbert · 2026-01-28 14:22:31 +09:00

0d3b7ab6be

Use enum for background states

Dean Herbert · 2026-01-27 18:58:03 +09:00

fa22d1f202

Fix mismatching spacing in dropdown form menus

Dean Herbert · 2026-01-27 18:49:53 +09:00

b5e93b98c9

Fix border showing for inner text boxes incorrectly

I turned masking back on on these for better visuals (text masking
aligns with rest of elements) but turns out this implicitly makes
borders draw.

Dean Herbert · 2026-01-27 18:36:37 +09:00

d6bf4fd90d

Standardise hover sounds for form elements

Closes #36444.

Dean Herbert · 2026-01-27 17:06:14 +09:00

dba17b1fa6

Standardise animations

Dean Herbert · 2026-01-27 17:06:13 +09:00

42dc73d849

Various metrics and visual tweaks

Dean Herbert · 2026-01-27 17:06:13 +09:00

6983227240

Make switch buttons look more like old version

Dean Herbert · 2026-01-27 17:06:11 +09:00

1c537a3278

Standardise background across form controls

Dean Herbert · 2026-01-27 17:06:11 +09:00

c88f10ca1b

Increase size of caption text

Dean Herbert · 2026-01-27 03:04:45 +09:00

7fef2ce1de

Remove enabled/disabled text from FormCheckbox

Dean Herbert · 2026-01-27 03:04:45 +09:00

9a5fd0addb

Adjust tooltip response speed and avoid using per-frame transforms

Dean Herbert · 2026-01-27 03:04:45 +09:00

9c0b1a4914

Work around flaky TestSceneFirstRunSetupOverlay tests

See inline commentary. I don't really have any energy left to provide
anything else, other than maybe a demonstration of how this dies in
framework:

diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneScreenStackUnbindOnExit.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneScreenStackUnbindOnExit.cs
new file mode 100644
index 000000000..c74ce6636
--- /dev/null
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneScreenStackUnbindOnExit.cs
@@ -0,0 +1,59 @@
+// 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 NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Screens;
+
+namespace osu.Framework.Tests.Visual.UserInterface
+{
+    public partial class TestSceneScreenStackUnbindOnExit : FrameworkTestScene
+    {
+        [Cached]
+        private ScreenStack screenStack = new ScreenStack();
+
+        [Test]
+        public void TestScreenExitUnbindDoesNotInterruptLoadComplete()
+        {
+            AddStep("set up the scenario", () =>
+            {
+                Child = screenStack;
+                screenStack.Push(new Screen());
+                screenStack.Push(new BrokenScreen());
+            });
+            AddUntilStep("wait to get to target screen", () => screenStack.CurrentScreen, Is.InstanceOf<Screen>);
+        }
+
+        private partial class BrokenSlider : BasicSliderBar<float>
+        {
+            [Resolved]
+            private ScreenStack screenStack { get; set; } = null!;
+
+            protected override void LoadComplete()
+            {
+                // exiting the current screen provokes the behaviour of unbinding all bindables in the screen's subtree
+                screenStack.CurrentScreen.Exit();
+
+                // ...but the following calls should still take correct effect inside `SliderBar`
+                // (namely one consisting of propagating `{Min,Max}Value` into `currentNumberInstantaneous`)
+                // so that it doesn't have its internal invariants violated
+                CurrentNumber.MinValue = -10;
+                CurrentNumber.MaxValue = 10;
+
+                // this notably calls `Scheduler.AddOnce(updateValue)` inside, which will happen *in the imminent future, in the same frame as `LoadComplete()` here.
+                // if the above mutations of `{Min,Max}Value` don't correctly propagate inside the slider bar due to an overly eager unbind, this will cause a crash.
+                base.LoadComplete();
+            }
+        }
+
+        private partial class BrokenScreen : Screen
+        {
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                InternalChild = new BrokenSlider();
+            }
+        }
+    }
+}

I attempted to address what I perceive to be the root issue here which
is that `ScreenStack` is allowed to arbitrarily unbind bindables under
drawables which are by all means still in the scene graph. The attempt
consisted of scheduling the unbind until after children of the screen
stack, but that caused 150 game-side tests to fail, seemingly on
something relevant to bindable leases, so I give up.

Bartłomiej Dach · 2026-01-23 13:07:42 +01:00

b7559f93f2

Fix broken percentage formatting in form slider bars

closes https://github.com/ppy/osu/issues/36428

this one's my bad:
https://github.com/ppy/osu/pull/36195#discussion_r2698388405

Bartłomiej Dach · 2026-01-23 08:01:41 +01:00

225f4d8814

Add failing tests

Bartłomiej Dach · 2026-01-23 07:50:20 +01:00

d80934c344

Merge branch 'master' into new-settings/overlay

Dean Herbert · 2026-01-22 18:38:17 +09:00

42302c45ec

Fix carousel items becoming incorrectly selected due to bindable leakage (#36414 )

As discussed in discord. Fixed from multiple angles.

---------

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

Dean Herbert · 2026-01-22 01:06:40 +09:00

10dc1314f6

Improve input handling in percentage-based slider bars (#36195 )

Reported in
https://github.com/ppy/osu/pull/36193#issuecomment-3703406223.

Preview:


https://github.com/user-attachments/assets/ac2b86cf-ad92-496b-b3dd-19ad47753a9b

---------

Co-authored-by: Dean Herbert <pe@ppy.sh>

Salman Alshamrani · 2026-01-17 16:39:28 +09:00

676b7a36da

Fix form dropdown open animation not being smooth (#36358 )

Preview:


https://github.com/user-attachments/assets/07cb58b7-5980-4fed-bb4c-2443ba1e9635

Salman Alshamrani · 2026-01-17 02:54:12 +09:00

b5a989d31e

Add localisation support for some more notifications (#36353 )

Co-authored-by: Dean Herbert <pe@ppy.sh>

Denis Titovets · 2026-01-16 22:58:20 +09:00

06b89919be

Update editor slider controls to new design (#36346 )

(partially) Closes: #36233
Surpasses: #36244 

This PR meant to be one of the last steps that finally make editor use
the new forms. Initially it meant to only change one
SliderWithTextBoxInput in "Effects section" in timing screen, however
soon after it was obvious that there's many other places that still
using it. This currently won't affect
IndeterminateSliderWithTextBoxInput that is being used in hitsounds, for
example, since I think it needs more consideration.
Anyways, with this PR, SliderWithTextBoxInput, will no longer be used at
all, as it's going to be replaced with modern FormSliderBar

Comparison:
|master|this PR|
|:---:|:---:|
|<img width="510" height="316"
alt="532203751-eb965923-d3a8-441d-a7c8-5c364a6328ad"
src="https://github.com/user-attachments/assets/268b45b8-e235-494f-91a5-d00db057dba8"
/>|<img width="540" height="321"
alt="535466527-3a700a8b-bc3c-4610-998f-a4e55ee03eed"
src="https://github.com/user-attachments/assets/20cd4b58-b0bd-49bc-8c48-7de5cf8556b3"
/>|
|<img width="694" height="639"
alt="534509844-f00e4da4-53c4-45e8-80ea-1be62da6c83b"
src="https://github.com/user-attachments/assets/398c4484-a867-4df1-9de3-0940aa748a01"
/>|<img width="720" height="433" alt="изображение"
src="https://github.com/user-attachments/assets/b6359443-a224-4a55-b171-07e8f013cf46"
/>|
|<img width="715" height="353"
alt="534509421-a6ac950f-16e8-4a16-bca6-1a781f82135f"
src="https://github.com/user-attachments/assets/4854312b-772f-4b81-a800-89e58d4c715d"
/>|<img width="710" height="296" alt="изображение"
src="https://github.com/user-attachments/assets/a7fed53e-e006-4285-92c9-bb84cb603f60"
/>|
|<img width="717" height="374"
alt="534509478-80222623-7766-481d-8682-088276d415ee"
src="https://github.com/user-attachments/assets/8143b6dc-4599-45d5-bd3b-f059caf3d93d"
/>|<img width="718" height="328" alt="изображение"
src="https://github.com/user-attachments/assets/bffa04de-983c-45ae-a1ec-373701ea0e49"
/>|
|<img width="702" height="446"
alt="534509935-58954060-7ac1-4392-8754-a58f909e86aa"
src="https://github.com/user-attachments/assets/2bb67a2d-3f57-42a1-96ce-b30b4891e1a4"
/>|<img width="722" height="386" alt="изображение"
src="https://github.com/user-attachments/assets/01b7fff4-7f31-4aac-90c9-353b15f4964e"
/>|

De4n · 2026-01-16 20:08:52 +09:00

e05b6f44b9

Fix double-clicking form slider bar not propagating default to other bindables when TransferValueOnCommit is true (#36354 )

- Addresses https://github.com/ppy/osu/pull/36346#discussion_r2692322683

The inner slider bar binds its `Current` to
`currentNumberInstantaneous`:


https://github.com/ppy/osu/blob/1add946db486c866cc214c5eb3d728f308aad637/osu.Game/Graphics/UserInterfaceV2/FormSliderBar.cs#L225-L236

But the current bindable of the form component doesn't update because of
this.


https://github.com/ppy/osu/blob/1add946db486c866cc214c5eb3d728f308aad637/osu.Game/Graphics/UserInterfaceV2/FormSliderBar.cs#L285-L293

Fixed it by just moving the `ResetToDefault` action up another level.

---------

Co-authored-by: Dean Herbert <pe@ppy.sh>

Joseph Madamba · 2026-01-16 19:48:36 +09:00

a8ada50549

Merge pull request #36324 from frenzibyte/better-form-button

Update form button UI/UX and support text wrapping

Dean Herbert · 2026-01-14 19:47:50 +09:00

91718447db

Adjust switch buttons to make the state more obvious

Dean Herbert · 2026-01-14 02:15:10 -05:00

029d544720

Rewrite input settings and use new form controls

Salman Alshamrani · 2026-01-14 02:15:10 -05:00

5d9ea9d699

Update game settings to use new form controls

Salman Alshamrani · 2026-01-14 02:15:10 -05:00

e548cd40dc

Allow dynamically configuring dropdown hint text

Used for "confine mouse mode" dropdown tooltip text.

Salman Alshamrani · 2026-01-14 02:12:53 -05:00

27abce74ce

Fix sliders not playing samples on adjust

Should've been true by default, minor mistake from a previous PR.

Salman Alshamrani · 2026-01-14 02:12:28 -05:00

8a581f5a90

Update button background colour in update function

Salman Alshamrani · 2026-01-14 01:34:20 -05:00

3f4d1b798e

Improve form dropdown UX (#36325 )

Addresses concerns in
https://github.com/ppy/osu/pull/36193#issuecomment-3728177951 (excluding
the last part, that is too involved and I can't imagine any workaround
for it due to how strict the `Dropdown` structure is). Also adds
truncation/padding to header label and search bar.

Preview:


https://github.com/user-attachments/assets/8885cb90-44dc-42ee-af21-cb33f7723e63

Salman Alshamrani · 2026-01-13 16:20:03 +09:00

f892d5fbaa

Update form button UI/UX and support text wrapping

Salman Alshamrani · 2026-01-12 23:38:17 -05:00

18fd4758d7

Merge branch 'master' into hide-cursor-during-background-reveal

UltraDrakon · 2026-01-12 18:30:35 +01:00

5899800293

Add star rating text gradient (#36292 )

Implements https://github.com/ppy/osu-web/pull/12363

There's one less colour in the spectrum than in the [web
code](https://github.com/ppy/osu-web/pull/12363/changes#diff-a9bdefd7233ca98f7f89cd76213aba5d869ae0424c8e79d1e322abd3e43462fbR31)
because the spectrum was actually defined incorrectly and has [one less
domain entry than it
should](https://github.com/ppy/osu-web/pull/12363/changes#diff-a9bdefd7233ca98f7f89cd76213aba5d869ae0424c8e79d1e322abd3e43462fbR29).
I've chose to not add it because of consistency with the web and because
it looked pretty ugly (it was pretty much unreadable)

<img width="1361" height="814" alt="image"
src="https://github.com/user-attachments/assets/5f9d7a93-3e28-4b8c-952c-0abd6f8c2cc3"
/>
<img width="805" height="647" alt="image"
src="https://github.com/user-attachments/assets/b060cba7-3beb-4bb5-8d50-6210e8417715"
/>

StanR · 2026-01-11 00:30:48 +09:00

3e7f0f4c61

Merge pull request #36242 from frenzibyte/form-controls-text-wrapping

Support text wrapping in form controls

Dean Herbert · 2026-01-09 18:06:24 +09:00

7652c91a53

Remove unnecessary and incorrect colour application

Dean Herbert · 2026-01-09 16:27:33 +09:00

a2d2c3287b

Fix now playing overlay buttons not showing toggle colour correctly

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

Dean Herbert · 2026-01-09 15:18:29 +09:00

3f577aae60

Hide cursor during background reveal in song select

- Implement IProvideCursor in SongSelect to hide cursor when background is revealed
- Cursor reappears on mouse movement and hides again after 1 second of inactivity
- Fix MenuCursorContainer to preserve drag rotation state during hide/show cycles

UltraDrakon · 2026-01-06 14:51:07 +01:00

8cbcb0e74f

3738 Commits