1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 12:02:54 +08:00
Commit Graph

865 Commits

Author SHA1 Message Date
Salman Ahmed
669e945fc3 Fix ModSelectOverlay not hiding without a footer 2024-07-11 14:56:17 +03:00
Salman Ahmed
337f05f9a4 Fix loading (but not showing) a sheared overlay hiding displayed footer content
Identified by tests. See https://github.com/ppy/osu/actions/runs/9869382635/job/27253010485 & https://github.com/ppy/osu/actions/runs/9869382635/job/27253009622.

This change also prevents the initial `PopOut` call in overlays from calling `clearActiveOverlayContainer`, since it's not in the update thread and it's never meant to be called at that point anyway (it's supposed to be accompanied by a previous `PopIn` call adding the footer content).
2024-07-10 11:56:35 +03:00
Salman Ahmed
002679ebb0 Ask for VisibilityContainer explicitly 2024-07-10 11:14:22 +03:00
Dean Herbert
9a88281ab0
Merge branch 'master' into footer-v2-integration 2024-07-10 15:33:05 +09:00
Dean Herbert
f281019358
Rename method to match provided argument 2024-07-10 14:00:15 +09:00
Dean Herbert
4e1240c349
Migrate ShearedOverlayContainer to NRT 2024-07-10 13:54:27 +09:00
Salman Ahmed
ed1f3a1eb4 Merge branch 'master' into footer-v2-integration 2024-07-09 13:48:40 +03:00
Salman Ahmed
b17af86491 Merge branch 'master' into footer-v2-overlay-content 2024-07-09 13:41:44 +03:00
Joseph Madamba
9532146978 Fix content overflowing to border
The +2 for the top isn't really needed for the original purpose as content fades out now, but visually, having the header and content spacing looks more correct.
2024-07-07 23:12:20 -07:00
Salman Ahmed
22f2f83695 Rescale chevron up and down instead 2024-07-08 08:07:57 +03:00
Salman Ahmed
a0ffe9bcbc Remove unnecessary HandlePositionalInput override 2024-07-08 07:58:40 +03:00
Salman Ahmed
0c5a1410d3 Add fade transition to content during open/close 2024-07-08 07:54:37 +03:00
Salman Ahmed
585e09981f Allow scrollbar to overlap content
The content is already padded enough to have the scrollbar sit on top.
Having the content change padding when the scrollbar appears gives an
unpleasent experience (especially when the scrollbar is hidden at first
but the user increases the content's height by clicking on a dropdown or
something)
2024-07-04 07:36:31 +03:00
Salman Ahmed
8658389854 Clarify how the panel blocks input 2024-07-04 07:34:19 +03:00
Salman Ahmed
f1012070c4
Merge branch 'master' into mod-select-customisation-panel 2024-07-03 07:36:52 +03:00
Salman Ahmed
1d94c96a8e Display customisation header in disabled state when no customisable mod selected 2024-07-02 14:40:16 +03:00
Salman Ahmed
e57a0029f1 Remove local footer from ShearedOverlayContainer 2024-06-30 06:50:36 +03:00
Salman Ahmed
48bf3f1385 Migrate mod select overlay footer content 2024-06-30 06:50:36 +03:00
Salman Ahmed
467d7c4f54 Refactor game-wide layout order of footer to fix depth issues with overlays and improve UX
With this new order, the logo can be easily moved to display in front of the footer in `SongSelectV2` without breaking experience when footer-based overlays are present. Such overlays (i.e. mod select overlay) will also be dimmed alongside the current screen when a game-wide overlay is open (e.g. settings).
2024-06-30 06:50:36 +03:00
Salman Ahmed
2319fa11ec Support performing custom overlay-specific action with back button 2024-06-30 04:32:36 +03:00
Salman Ahmed
916d0bfcc2 Temporarily show screen footer if hidden while overlay is present 2024-06-30 04:32:36 +03:00
Salman Ahmed
68b8a4fb2a Use ScreenFooter for displaying footer buttons from overlays 2024-06-30 04:32:36 +03:00
Salman Ahmed
c6c75ae48d Merge branch 'master' into footer-v2-side-buttons 2024-06-29 08:19:49 +03:00
Salman Ahmed
86b8357b8b Improve UX & input handling when customisation panel is open 2024-06-28 08:53:31 +03:00
Dean Herbert
d370f50cc1
Syncrhronise colours across mod and preset tooltips 2024-06-28 13:16:54 +09:00
Dean Herbert
28d5278935
Show preset description text in tooltip popup
As proposed in https://github.com/ppy/osu/discussions/28610.
2024-06-28 13:16:53 +09:00
Salman Ahmed
167ffac218 Reorder container layout for popovers to recognize clicks on customisation panel
Basically moves `PopoverContainer` to cover both the columns and the customisation panel, so that if the customisation panel is clicked on, the popover container will notice that and hide popovers like the mod preset popover.
2024-06-28 06:35:21 +03:00
Salman Ahmed
a277d9df13 Kill focus from components when clicking on an empty space in the panel 2024-06-25 07:13:36 +03:00
Salman Ahmed
3f06a0ef9e Block certain operations when customisation panel is open
Normally I would just block keyboard input from going past `ModCustomisationPanel`, but it's a little complicated here since I'm dealing with global action key binding presses, and I also still want actions like `GlobalAction.Back` to get past the customisation panel even if it's expanded.
2024-06-25 06:16:46 +03:00
Salman Ahmed
57ee794398 Add extra margin to avoid 1px artifacts 2024-06-25 06:08:13 +03:00
Salman Ahmed
0a72394c8a Fix customisation panel conflicting with beatmap attributes when collapsed 2024-06-25 06:04:39 +03:00
Salman Ahmed
e23da93c09 Use new display on mod select overlay and remove old display 2024-06-23 08:22:50 +03:00
Salman Ahmed
04efa61156 Add different display for mod customisation 2024-06-23 08:22:13 +03:00
Bartłomiej Dach
659505f711
Adjust calls to GetContainingInputManager() 2024-06-18 07:41:19 +02:00
Bartłomiej Dach
8a4ae5d23d
Null-propagate all calls to GetContainingFocusManager() 2024-06-18 07:30:46 +02:00
Dean Herbert
dd3f4bcdab
Fix code quality and null handling 2024-06-07 00:01:50 +08:00
Xesquim
860afb8123 Creating method in ModUtils to calculate the rate for the song 2024-06-06 10:06:07 -03:00
Dean Herbert
4408039b3e
Merge branch 'master' into footer-v2-back-button 2024-05-28 15:50:34 +09:00
Bartłomiej Dach
c800bb5339
Merge branch 'master' into lazer-speedkeys 2024-05-24 13:19:26 +02:00
Bartłomiej Dach
cab8cf7410
Move mod speed hotkey handler to user mod select overlay
The very base class is the wrong place for it because
`FreeModSelectOverlay` inherits from it, and that one has different
assumptions and rules than "user" selection. In particular, in non-user
selection, more than one rate adjust mod may be active, which breaks the
mod speed hotkey's basic assumptions.
2024-05-24 13:14:06 +02:00
Bartłomiej Dach
b1b207960a
Actually use return value 2024-05-24 13:09:44 +02:00
Bartłomiej Dach
8cac87e496
Fix speed controls in mod select overlay not handling repeat 2024-05-24 13:09:07 +02:00
Bartłomiej Dach
63406b6feb
Rewrite implementation 2024-05-24 13:03:42 +02:00
Dean Herbert
66ceda1d67
Update focus specifications in line with framework changes 2024-05-22 21:32:49 +08:00
Dean Herbert
f979200712
Use null conditional rather than implicit not-null 2024-05-22 12:06:51 +08:00
Dean Herbert
1fdebe94ac
Merge branch 'master' into lazer-speedkeys 2024-05-22 12:05:04 +08:00
Dean Herbert
02a388cba6
Fix enum not being at end (and adjust naming) 2024-05-22 12:03:48 +08:00
Fabian van Oeffelt
80064c4b98 Speedchange now also works in Modselect 2024-05-18 18:38:23 +02:00
Salman Ahmed
310b4d90cc Move SHEAR constant to OsuGame and revert back to 0.2x (i.e. master)
Discussed in [discord](https://discord.com/channels/188630481301012481/188630652340404224/1240490608934653984).
2024-05-16 07:28:02 +03:00
Salman Ahmed
9265290acf Change shear factor everywhere to 0.15x 2024-05-16 05:33:01 +03:00