1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 18:33:22 +08:00
Commit Graph

8962 Commits

Author SHA1 Message Date
Bartłomiej Dach
27fabd99fb
Rename variables for legibility
Having `typedComponents` and `typeComponents` next to each other is
asking for trouble.
2023-05-03 19:21:16 +02:00
cdwcgt
4549a865d9
Merge branch 'master' into export 2023-05-04 00:18:01 +09:00
cdwcgt
967e801f9c
code inspect 2023-05-03 23:26:58 +09:00
cdwcgt
debbd376bd
move scrollContent update logic to updateActiveState() 2023-05-03 23:24:14 +09:00
cdwcgt
f4b1264cc9
use button Enable status to ensure preset name is not null 2023-05-03 23:22:46 +09:00
cdwcgt
aa5a026c67
remove local button handle 2023-05-03 23:14:24 +09:00
cdwcgt
c609e6345c
remove Use Current Mods menu item 2023-05-03 23:02:50 +09:00
Cootz
152d2678d5 Fix ModSelectColumn completely disappear from ModSelectOverlay 2023-05-03 14:00:46 +03:00
Dean Herbert
be15d07b17 Tidy up various implementation details 2023-05-03 18:59:39 +09:00
Dean Herbert
b932e4d986 Rename DrawableUsername to DrawableChatUsername and only pass message ID 2023-05-03 18:53:22 +09:00
Dean Herbert
4f55afb60d Merge branch 'master' into chat-report 2023-05-03 18:50:38 +09:00
Joseph Madamba
1c74f6e8ea
Fix regressed button hover fade in 2023-05-02 22:54:42 -07:00
Joseph Madamba
bede1292de
Fix overlay scroll back button not absorbing hover from behind 2023-05-02 22:40:37 -07:00
Dean Herbert
e394b487e0
Merge branch 'master' into edit-mods-preset 2023-05-03 12:06:16 +09:00
Cootz
a6ca049739 Manually implement @bdach prototype 2023-05-02 14:15:33 +03:00
Dean Herbert
4a97c2c105
Merge pull request #23038 from cdwcgt/scale-background-dim
Add feature to adjust `ScalingContainer` background dim
2023-05-02 15:36:52 +09:00
Dean Herbert
ce4a6c38a0
Merge pull request #22950 from Joehuu/fix-initial-playlist-highlight
Fix now playing playlist not highlighting selected item on initial open
2023-05-02 15:36:34 +09:00
Dean Herbert
ab4f66fad3 Minor readability refactors 2023-05-02 14:31:39 +09:00
Dean Herbert
7a840e1d82 Remove unnecessary TransferValue spec 2023-05-02 14:29:26 +09:00
Dean Herbert
7efaa299bd Merge branch 'master' into scale-background-dim 2023-05-02 14:24:54 +09:00
Dean Herbert
736be6a73b Refactor slightly for readability 2023-05-02 14:11:16 +09:00
Dean Herbert
e808e7316b Mark delegate value unused and add comment to avoid future regression 2023-05-02 13:29:30 +09:00
Terochi
4d52ce769b Revert SaveState() calling on initialization 2023-05-01 12:53:58 +02:00
Bartłomiej Dach
7cedbca9be
Merge branch 'master' into multiplier-doesnt-update-with-preset-mod 2023-04-30 17:36:00 +02:00
Bartłomiej Dach
2e3daf0a54
Fix leak of ModSettingChangeTracker instances
The `SelectedMods.BindValueChanged()` callback in `ModSelectOverlay` can
in some instances run recursively. This is most heavily leaned on in
scenarios where `SelectedMods` is updated by an external component. In
such cases, the mod select overlay needs to replace the mod instances
received externally with mod instances which it owns, so that the changes
made on the overlay can propagate outwards.

This in particular means that prior to this commit, it was possible to
encounter the following scenario:

	modSettingChangeTracker?.Dispose();
	updateFromExternalSelection(); // mutates SelectedMods to perform the replacement
	                               // therefore causing a recursive call

		modSettingChangeTracker?.Dispose();
		// inner call continues
		modSettingChangeTracker = new ModSettingChangeTracker(SelectedMods.Value);

	// outer call continues
	modSettingChangeTracker = new ModSettingChangeTracker(SelectedMods.Value);

This leaks one `modSettingChangeTracker` instance from the inner call,
which is never disposed.

To avoid this, move the disposal to the same side of the recursion that
the creation happens on, changing the call pattern to:

	updateFromExternalSelection(); // mutates SelectedMods to perform the replacement
	                               // therefore causing a recursive call

		modSettingChangeTracker?.Dispose();
		// inner call continues
		modSettingChangeTracker = new ModSettingChangeTracker(SelectedMods.Value);

	modSettingChangeTracker?.Dispose();
	// outer call continues
	modSettingChangeTracker = new ModSettingChangeTracker(SelectedMods.Value);

which, while slightly wasteful, does not cause any leaks.

The solution is definitely suboptimal, but addressing this properly
would entail a major rewrite of the mod instance management in the mods
overlay, which is probably not the wisest move to make right now.
2023-04-30 17:31:41 +02:00
Terochi
fb4b681cc5 Use Queue instead of Stack 2023-04-30 16:36:01 +02:00
Terochi
8f02bd80f9 Addressed changes 2023-04-30 16:11:52 +02:00
Terochi
949dc1c0f9 Improved logic 2023-04-30 12:05:55 +02:00
Terochi
8ec2154965 Fixed ApplyStateChange to happen in correct order 2023-04-30 02:01:18 +02:00
Terochi
17e4b75dfd Save first state when editing 2023-04-29 20:54:19 +02:00
Terochi
3b0ba4b38b Improved logic for ApplyStateChange for skin editor 2023-04-29 19:52:22 +02:00
Bartłomiej Dach
646d4965b9
Merge branch 'master' into fix-exclusive-fullscreen-detection 2023-04-29 14:39:34 +02:00
_ltn
2d6c0d2900 use of Child instead of Children 2023-04-28 19:24:07 +03:00
Dean Herbert
6929be49b7 Change condition for exclusive fullscreen notice to only show when using the correct renderer
This avoids the notice showing when running on windows, but using the
newer renderers (where the underlying logic hasn't been tested properly
and can result in false-positives).

Supersedes https://github.com/ppy/osu-framework/pull/5759 as a more
correct implementation.
2023-04-28 22:36:30 +09:00
_ltn
4b0ee392f6 add OsuHoverContainer 2023-04-28 05:48:54 +03:00
_ltn
17730f05bc remove UpdateableCountryText 2023-04-28 05:47:05 +03:00
_ltn
4d144cd5b5 clearing the code 2023-04-28 02:06:13 +03:00
_ltn
092377fdaa moving UpdateableCountryText 2023-04-28 01:47:14 +03:00
_ltn
e9843f2066 replace country text object 2023-04-28 01:16:50 +03:00
Cootz
b795e8ac5a Use ModSearch in ModeSelectOverlay 2023-04-27 17:26:35 +03:00
Cootz
3c6141f233 Add ModSearch 2023-04-27 17:08:29 +03:00
Hy0tic
56ab029a58 fix issue where multipler does not update when adjusting speed for preset mod 2023-04-22 13:30:08 -04:00
Joseph Madamba
776c4cfaad
Ensure selected field is correct in updateSelectionState()
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-04-19 18:34:35 -07:00
Dean Herbert
52c4703261
Merge pull request #23103 from Joehuu/normalise-overlay-padding
Normalise horizontal padding on overlays
2023-04-10 23:48:59 +09:00
Bartłomiej Dach
1f2c96c8e8
Merge branch 'master' into gd-onlinesetoverlay 2023-04-10 15:35:03 +02:00
Bartłomiej Dach
11fd93a2ba
Inline disturbing getGuestMapper() method
Disturbing because name suggests pure method, but it is in fact `void`
and also performs side effects by about the most confusing means
possible.
2023-04-10 15:20:43 +02:00
cdwcgt
ce6a87b4a3
Merge remote-tracking branch 'upstream/master' into export 2023-04-09 15:02:47 +09:00
cdwcgt
de21b4a2f7
use Live<TModel>
Use RealmAccess only when needed
2023-04-09 22:21:15 +09:00
Joseph Madamba
a86a968fac
Use public BeatmapSet to match other usages 2023-04-07 21:16:36 -07:00
Joseph Madamba
ed208ef127
Fix more typos and adjust font size to match web 2023-04-07 21:10:37 -07:00
Bartłomiej Dach
b5d9284de2
Merge pull request #23108 from peppy/fix-overlay-toggles-during-disclaimer
Fix attempting to show overlay during game intro playing hide sound effects
2023-04-03 20:48:03 +02:00
cdwcgt
9dd30e4b4c
condition fix 2023-04-03 20:24:38 +09:00
cdwcgt
735b48679e
use LinkFlowContainer directly 2023-04-03 20:09:49 +09:00
cdwcgt
41c01d3929
nullable condition 2023-04-03 20:07:21 +09:00
cdwcgt
51240ed46b
typo 2023-04-03 19:51:22 +09:00
Dean Herbert
43d7386623
Merge pull request #22926 from Joehuu/fix-sort-direction-not-resetting
Fix beatmap listing sort direction not resetting when changing criteria
2023-04-03 15:32:10 +09:00
Dean Herbert
e4eb736622
Merge pull request #22929 from Joehuu/fix-loading-blocking-overlay-headers
Fix beatmap listing filter control being blocked by loading layer
2023-04-03 15:29:38 +09:00
Dean Herbert
a097433cb1 Fix overlay toggle keys working during disabled activation modes
Closes #23104.
2023-04-03 15:03:47 +09:00
Joseph Madamba
247d426c8a
Add horizontal padding to currently playing search textbox 2023-04-02 20:50:18 -07:00
Joseph Madamba
436f1e4ae4
Replace other hardcoded horizontal padding with const
- Also add overlay stream item padding const and account for it
2023-04-02 20:50:18 -07:00
Joseph Madamba
af389b1107
Replace all hardcoded 50 horizontal padding with const 2023-04-02 20:50:18 -07:00
Joseph Madamba
7a0edabd5d
Normalise overlay horizontal padding const 2023-04-02 20:24:13 -07:00
Joseph Madamba
63ea17f10e
Update comment vote pill in line with web 2023-04-02 18:17:40 -07:00
Susko3
c3a6a58169 Fix window mode dropdown not showing 2023-04-02 19:23:18 +02:00
cdwcgt
d949ef3ca4
make guestMapperContainer private
tests don't use it
2023-04-02 22:53:15 +09:00
cdwcgt
2cf8636366
show guest diff author in BeatmapPicker 2023-04-02 22:25:58 +09:00
Dean Herbert
4c2b7e7788 Fix random inspection showing up only in CI 2023-04-02 21:05:20 +09:00
Dean Herbert
cf5acbf66e Update usage of SupportedWindowModes 2023-04-02 20:16:14 +09:00
cdwcgt
5d395e6d37
move to ctor 2023-03-29 22:59:54 +09:00
cdwcgt
e85c28031e
change weird name 2023-03-29 22:55:25 +09:00
cdwcgt
46ede27869
add feature to adjust ScalingContainer background dim 2023-03-28 22:41:24 +09:00
cdwcgt
31df626f0e disable button when select other reason 2023-03-28 21:32:28 +09:00
cdwcgt
899860dd77 Merge branch 'master' into chat-report 2023-03-28 21:14:11 +09:00
Dean Herbert
8c1df3c8d9 Fix web account registration not bypassing the URL warning 2023-03-28 15:38:19 +09:00
cdwcgt
b065689cf8 Limit the area of popover to DrawableChannel
popover may be blocked by textBar
2023-03-27 23:04:45 +09:00
Dean Herbert
898717231b Hide vulkan renderer option for now
We'll bring it back when it's more stable.
2023-03-27 02:00:10 +09:00
Bartłomiej Dach
292486c25a
Use more resilient restore method 2023-03-26 14:35:00 +02:00
Bartłomiej Dach
f3c174a7f2
Fix test errors due to missing dependencies 2023-03-26 13:52:26 +02:00
Dean Herbert
bab93bed17 Fix string interpolation and use GetDescription on renderer value 2023-03-26 20:43:28 +09:00
Dean Herbert
ba078e8357 Show "automatic" resolved renderer inline in dropdown instead 2023-03-26 20:29:30 +09:00
Dean Herbert
764361b3d3 Add special case to hide definitely non-working renderers on android 2023-03-26 20:14:33 +09:00
Dean Herbert
e346b02ebf Add display of current renderer 2023-03-26 20:09:35 +09:00
Joseph Madamba
eaef5ff2a3
Fix now playing playlist not highlighting selected item on initial open 2023-03-25 22:13:51 -07:00
Joseph Madamba
450c5cef07
Add comment explaining loading container padding 2023-03-24 18:42:34 -07:00
Dean Herbert
ab6cfea5c7
Revert old value instead of always using default
Co-authored-by: cdwcgt <loginchen@outlook.com>
2023-03-23 11:27:05 +09:00
cdwcgt
85a924f078 why
merge problem?
2023-03-23 01:02:17 +09:00
cdwcgt
8518d15b8d use endpoint 2023-03-23 01:00:38 +09:00
Dean Herbert
3050a16bf8 Don't require a restart when selecting Automatic and startup setting was also automatic 2023-03-22 16:56:36 +09:00
Dean Herbert
aabe86dc26 Limit renderers to those available for the current platform 2023-03-22 16:49:29 +09:00
Dean Herbert
956fabb445 Show restart notice when changing renderer 2023-03-22 16:49:29 +09:00
Dean Herbert
13be709718 Add basic renderer selection 2023-03-22 16:49:29 +09:00
Dean Herbert
db227b1798 Merge branch 'master' into chat-report 2023-03-22 16:26:28 +09:00
Joseph Madamba
6f3bb85eaa
Always show down arrow on inactive sort buttons 2023-03-22 00:19:23 -07:00
Joseph Madamba
d9571b6fc9
Move filter control property setters to load() 2023-03-21 21:31:35 -07:00
Joseph Madamba
74a15d7424
Fix overlay headers being blocked by loading layer 2023-03-21 20:32:26 -07:00
Joseph Madamba
e1fb63e1f3
Move beatmap listing filter control to header 2023-03-21 20:32:26 -07:00
Joseph Madamba
3cd01ee621
Fix beatmap listing sort direction not resetting when changing criteria 2023-03-21 15:08:37 -07:00
Joseph Madamba
df3ccdff9f
Add failing beatmap listing sort direction on criteria change test 2023-03-21 15:08:37 -07:00
Bartłomiej Dach
9ff9cd3b7f
Merge branch 'master' into skin-editor-cyclic-selection 2023-03-21 19:49:55 +01:00
Joseph Madamba
970df5d88a
Update profile kudosu section in line with web 2023-03-18 19:49:30 -07:00