1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-16 14:17:27 +08:00
Commit Graph

10029 Commits

Author SHA1 Message Date
jkh675
8f86681110 Replace OsuSpriteText with TextFlowContainer 2024-07-29 18:29:44 +08:00
jkh675
90fdf5599f Revert changes 2024-07-29 18:14:07 +08:00
jkh675
5ec46a79b4 Only create a new drawable object when the background is needed 2024-07-29 17:50:23 +08:00
jkh675
63757a77a5 Extract update background method 2024-07-29 13:39:08 +08:00
normalid
4e65944609 Make the tooltips width be dyanmic with the content, so the long text wont occurs wierd line break 2024-07-28 16:26:18 +08:00
normalid
5db0e36404 Use the TruncatingSpriteText in ModPresetTooltip 2024-07-28 16:18:43 +08:00
Salman Ahmed
6bdb1107c1 Add shadow over tooltip 2024-07-28 06:35:00 +03:00
Salman Ahmed
31787757ef Provide colour scheme as part of tooltip data to handle reusing tooltip with different profile hues 2024-07-28 06:21:23 +03:00
Salman Ahmed
e82c54a31c Integrate daily challenge streak display with user profile overlay 2024-07-28 05:58:30 +03:00
Salman Ahmed
17f5d58be2 Add daily challenge streak display and tooltip 2024-07-28 05:58:27 +03:00
normalid
4e44a6e7f8 Clean up code 2024-07-27 18:55:17 +08:00
normalid
73a98b45e9 FIx code quality 2024-07-27 18:48:45 +08:00
Caiyi Shyu
77d64e0c3d replace with ReceivePositionalInputAt 2024-07-27 17:59:38 +08:00
normalid
c2711d0c4e Implement chatline background altering 2024-07-27 17:25:44 +08:00
Caiyi Shyu
fc842868a9 fix code quality 2024-07-27 16:24:20 +08:00
Caiyi Shyu
b97d96fcb0 Fix panel collapse when hovering dropdown menu 2024-07-27 15:15:14 +08:00
Caiyi Shyu
aed81d9758 make code inspector happy 2024-07-26 22:56:07 +08:00
Caiyi Shyu
0cc6818b21 allow hover to expand ModCustomisationPanel 2024-07-26 22:44:50 +08:00
Bartłomiej Dach
dd8be62d07
Merge pull request #28849 from frenzibyte/custom-profile-colour
Add custom hue support to user profile overlay
2024-07-22 09:41:32 +02:00
Dan Balasescu
30b5825549
Merge pull request #28942 from bdach/aaaaaaaaaaaaaaaaaaaaaaaa
Fix skipping to next track not working
2024-07-19 15:23:24 +09:00
Bartłomiej Dach
9fe6354afc
Fix backwards conditional 2024-07-19 07:32:36 +02:00
Salman Ahmed
2ad8eeb918 Fix beatmap attributes display in mod select recreating star difficulty bindable every setting change 2024-07-19 03:25:26 +03:00
Salman Ahmed
5317086171 Split content recreation methods 2024-07-18 00:26:37 +03:00
Salman Ahmed
d61a72b8fb Explicitly define Hue rather than implicitly provide it by enum value 2024-07-18 00:26:24 +03:00
Salman Ahmed
4eb4d35e2f Make UpdateColours method protected 2024-07-18 00:26:24 +03:00
Bartłomiej Dach
e4ff6b5c8b
Add flags allowing excluding protected beatmaps from consideration in music controller
This means that the protected beatmap can not be skipped forward/back
to.

Incidentally closes https://github.com/ppy/osu/issues/23199.
2024-07-17 12:46:24 +02:00
Bartłomiej Dach
1ffc34b651
Do not show protected beatmaps in playlist overlay
Secondary fix to https://github.com/ppy/osu/issues/28880.
2024-07-17 11:46:59 +02:00
Salman Ahmed
adb803c7a9 Force recreating sections container when loading new user to avoid weird UX when scrolled away 2024-07-14 15:19:37 +03:00
Salman Ahmed
43d08f702a Or just use Colour4 where we have that fixed 2024-07-13 18:45:50 +03:00
Salman Ahmed
b12790c684 Fix hue number 360 giving off a gray colour scheme
They say it's not a bug, it's a feature...I dunno maybe later.
2024-07-13 18:29:06 +03:00
Dean Herbert
c854dfd6fb
Merge pull request #28832 from nekodex/ui-sfx-tweaks
UI SFX Tweaks/Updates
2024-07-13 23:24:06 +09:00
Salman Ahmed
b292bf3832 Support using custom hue in user profile overlay 2024-07-13 11:58:54 +03:00
Salman Ahmed
933626a64b Support using custom hue in OverlayColourProvider 2024-07-13 11:58:54 +03:00
Dean Herbert
eb3f480a2a
Merge pull request #28683 from frenzibyte/footer-v2-integration
Replace local footer in existing sheared overlays (e.g. mod select & first-run setup) with `ScreenFooter`
2024-07-12 22:45:06 +09:00
Jamie Taylor
320df7da2b
Use separate samples for scrolling to top and scrolling to previous 2024-07-12 21:01:19 +09:00
Jamie Taylor
ad2b354d9c
Update sample looping behaviour to better suit new sample 2024-07-12 21:01:19 +09:00
Bartłomiej Dach
452fbed681
Merge pull request #28808 from frenzibyte/fix-all-notifications
Fix confirm exit dialog potentially showing incorrect number of ongoing operations
2024-07-12 10:56:29 +02:00
Salman Ahmed
d4a4a059d4 Fix footer content not accessible by overlay when overriden by a subclass 2024-07-11 15:31:02 +03:00
Salman Ahmed
669e945fc3 Fix ModSelectOverlay not hiding without a footer 2024-07-11 14:56:17 +03:00
Salman Ahmed
bd44c17079 Enable NRT in VolumeOverlay 2024-07-11 14:29:56 +03:00
Salman Ahmed
3190f8bb7e Remove key arrow handling in VolumeOverlay 2024-07-11 14:29:33 +03:00
Salman Ahmed
7b541d378c Revert some changes
I can see `IsDisplayingToast` being removed and `IsPresent` becoming `=> Notifications.Any()` but I'll just leave this for another day.
2024-07-11 14:23:11 +03:00
Salman Ahmed
846fd73ac9 Fix notification toast tray potentially hiding some notifications 2024-07-10 16:15:02 +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
cd968d4185 Add caret transition to beatmap sort tab items 2024-07-08 16:46:35 -07:00
Dean Herbert
c0a1696538
Merge pull request #28762 from frenzibyte/change-chevron-display
Change display of "expanded" chevrons in many UI components to use scale instead of rotation
2024-07-08 20:05:59 +09:00
Salman Ahmed
2fcc61edfa
Merge branch 'master' into audio-ducking-fx 2024-07-08 12:50:46 +03:00
Bartłomiej Dach
14a93bfc1a
Merge pull request #28553 from frenzibyte/mod-select-customisation-panel
Detach mod customisation area from the footer and replace with an overlay panel display
2024-07-08 11:26:21 +02:00
Salman Ahmed
784a9ae743
Merge branch 'master' into audio-ducking-fx 2024-07-08 12:26:10 +03:00
Joseph Madamba
73d164e0d0 Add chevron transition to CommentRepliesButton 2024-07-08 00:32:54 -07:00
Dean Herbert
03bd6069d8
Add slight animation when revert to default button is displayed
This also fixes the transforms running too often (could make the initial
transform take longer than expected if adjusting a slider bar, for
instance).
2024-07-08 15:50:27 +09: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
58e236a247 Add transition to dropdown chevrons 2024-07-08 08:48:52 +03:00
Salman Ahmed
4c2ae07eba Use scale instead of rotation in ChevronButton (used in top-right of comments section) 2024-07-08 08:48:07 +03:00
Salman Ahmed
dc630ddc9d Use scale instead of rotation in news month sidebar 2024-07-08 08:45:44 +03:00
Salman Ahmed
be039b85ad Use scale instead of rotation in profile cover toggle button 2024-07-08 08:32:29 +03:00
Salman Ahmed
5223e0aeae Use scale instead of rotation for overlay scroll button 2024-07-08 08:31:33 +03: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
Dean Herbert
3650f3c479
Allow multiple ducks with same parameters 2024-07-08 13:52:40 +09:00
Dean Herbert
0067450b22
Change volume parameter to double 2024-07-08 13:47:57 +09:00
OliBomby
5da8bb5bec prevent volume control from eating inputs 2024-07-07 21:33:27 +02:00
Dean Herbert
5907e0d1eb
Make DuckDuration non-zero by default 2024-07-05 18:39:13 +09:00
Dean Herbert
7efb4ce30a
Fix multiple disposals resulting in assert being hit 2024-07-05 18:39:12 +09:00
Dean Herbert
717f7ba9f0
Better support multiple concurrent ducking operations 2024-07-05 18:12:40 +09:00
Dean Herbert
20ba6ca867
Add mention of return type for Duck method 2024-07-05 15:11:11 +09:00
Dean Herbert
554740af10
Adjust ducking API to use a parameters record 2024-07-05 15:04:40 +09:00
Dean Herbert
0d858ce8f8
Change default easings to In/Out for all ducking operations 2024-07-05 13:51:41 +09:00
Dean Herbert
ec4623d49f
Reduce duck length slightly on toolbar ruleset selector 2024-07-05 13:51:29 +09:00
Dean Herbert
0696e2df32
Apply nullability to ducking methods 2024-07-05 12:58:34 +09:00
Dean Herbert
7f84e377ab
Merge branch 'music-controller-nullability' into audio-ducking-fx 2024-07-05 12:57:39 +09:00
Dean Herbert
d21eec9542
Apply nullability to MusicController 2024-07-05 12:50:15 +09:00
Jamie Taylor
a5077fcb3f
Rename TimedDuck -> DuckMomentarily 2024-07-04 17:22:33 +09:00
Jamie Taylor
82e4e884d7
Change overlapping Duck() usages to be a noop instead of a throw 2024-07-04 15:51:50 +09:00
Jamie Taylor
753463fadb
Fix code style 2024-07-04 15:01:37 +09:00
Jamie Taylor
681398059e
Merge branch 'master' into audio-ducking-fx 2024-07-04 14:28:37 +09:00
Jamie Taylor
d948193757
Change Duck() to be IDisposable and prevent overlapping usages 2024-07-04 14:23:35 +09: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
OliBomby
d0715c5f12 scale along rotated axis 2024-07-03 16:23:19 +02:00
Bartłomiej Dach
e73faaefd2
Merge branch 'master' into editor-test-play 2024-07-03 13:54:47 +02:00
Jamie Taylor
d29d114133
Match prior ducking behaviour 2024-07-03 13:52:20 +09:00
Jamie Taylor
b972632e4f
Change default easing to match prior behaviour 2024-07-03 13:50:35 +09:00
Jamie Taylor
153138cdac
Use null to disable audio filter instead 2024-07-03 13:47:59 +09:00
Salman Ahmed
f1012070c4
Merge branch 'master' into mod-select-customisation-panel 2024-07-03 07:36:52 +03:00
Dean Herbert
5350945340
Update HasFlag usages 2024-07-03 00:19:04 +09:00
Bartłomiej Dach
d85c467856
Implement quick exit hotkeys for editor test play 2024-07-02 14:34:36 +02: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
a65af8249c Fix first-run setup buttons reset after reopening from dismiss 2024-06-30 07:27:35 +03:00
Salman Ahmed
e57a0029f1 Remove local footer from ShearedOverlayContainer 2024-06-30 06:50:36 +03:00
Salman Ahmed
5dd822ea38 Migrate first-run setup overlay footer content 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
b8816bfc28 Update colour scheme of footer in line with visible overlay 2024-06-30 04:32: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
Bartłomiej Dach
007bd3973a
Merge pull request #28653 from peppy/featured-artist-even-more-visible
Update beatmap listing filter overlay to better imply selected filters
2024-06-28 09:50:21 +02:00
Bartłomiej Dach
030bbf2641
Fix vertical overlaps on multiselection filters when they wrap 2024-06-28 09:07:29 +02:00
Dean Herbert
fa1527f446
Update design for selected filters to better imply that they are selected 2024-06-28 15:45:09 +09:00
Dan Balasescu
77b00dac7e
Fix low pass filter sometimes not applied in dialog overlays 2024-06-28 15:20:55 +09:00
Dean Herbert
c1bec7a7c3
Simplify colour logic for beatmap overlay filter rows 2024-06-28 14:55:55 +09: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
Dean Herbert
d722be16e3
Add missing base calls for safety 2024-06-25 23:41:43 +09: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
Jamie Taylor
2ffeb1b361
Add fallback behaviour for custom rulesets 2024-06-23 02:20:51 +09:00
Jamie Taylor
0d11b2b91c
Replace manual usages of AudioFilter with new ducking methods 2024-06-22 01:57:14 +09:00
Jamie Taylor
a56751511e
Apply a ducking effect to the currently playing track when switching ruleset 2024-06-22 01:36:30 +09: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
Bartłomiej Dach
3afe98612c
Add RestoreState() to IEditorChangeHandler 2024-06-11 11:31:30 +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
Bartłomiej Dach
cb72630ce1
Fix compile failures 2024-05-31 08:09:06 +02:00
Dean Herbert
5dfeaa3c4a
Move dialog strings to more common class name 2024-05-31 11:46:32 +09:00
Bartłomiej Dach
7b7e439d03
Merge branch 'master' into scale-tool 2024-05-29 10:15:48 +02:00
Bartłomiej Dach
4c881b5633
Use better name if we're renaming 2024-05-29 09:40:29 +02:00
OliBomby
a89ba33b47 rename CanScaleSelectionOrigin/PlayfieldOrigin to make clear its not the origin being scaled 2024-05-28 16:14:16 +02:00
Dean Herbert
4408039b3e
Merge branch 'master' into footer-v2-back-button 2024-05-28 15:50:34 +09:00
Dean Herbert
b6471f0b9c
Allow previewing audio of playlist items 2024-05-27 17:09:37 +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
345fb60679
Fix toast strings 2024-05-24 13:08:17 +02:00
Bartłomiej Dach
63406b6feb
Rewrite implementation 2024-05-24 13:03:42 +02:00
Bartłomiej Dach
8a2dd4d816
Merge branch 'master' into scaling 2024-05-23 15:10:40 +02:00
Bartłomiej Dach
ac5c031a3a
Simplify original state management in skin selection scale handler 2024-05-23 15:01:28 +02:00
Dean Herbert
66ceda1d67
Update focus specifications in line with framework changes 2024-05-22 21:32:49 +08:00
Fabian van Oeffelt
57da4229ff Add speed value to Toast 2024-05-22 13:58:59 +02:00
Dean Herbert
d0b1ebff5a
Revert "Temporary rollback of framework / SDL3"
This reverts commit d7d569cf4e.
2024-05-22 16:29:39 +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