1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 03:07:26 +08:00
Commit Graph

73 Commits

Author SHA1 Message Date
Dean Herbert
6546f5968a Merge branch 'master' into skin-editor-cyclic-selection 2023-03-14 20:43:56 +09:00
Bartłomiej Dach
5213bfa5c9
Merge branch 'master' into make_skin_reset_dangerous 2023-03-07 21:06:44 +01:00
Dean Herbert
97bee4db89 Fix localisations 2023-03-07 18:07:53 +09:00
Dean Herbert
26ef7c2637 Rename confirmation dialog class to mention revert not reset 2023-03-07 18:07:46 +09:00
Dean Herbert
21bdbb20e6 Add optional support for cyclic selection to BlueprintContainer 2023-03-07 14:22:12 +09:00
mk56-spn
908651cc11 make ResetConfirmDialog properly utilise its parent's logic
Adjust name of `DeleteAction` to `DangerousAction`
2023-03-05 20:57:26 +01:00
Bartłomiej Dach
60cdd3c070
Clear components sidebar unconditionally on every target change
Fixes the working layer dropdown lingering after exiting from a
skinnable screen to a non-skinnable one.
2023-03-04 14:10:05 +01:00
Bartłomiej Dach
d233f3a3ab
Show non-skinnable screen placeholder at higher level 2023-03-04 13:49:10 +01:00
Bartłomiej Dach
49e298e304
Accept ISerialisableDrawableContainer directly in SkinBlueprintContainer
An end result of #22674 is that `SkinBlueprintContainer`s are only ever
created by supplying a `SkinComponentsContainer` to them. However,
`SkinBlueprintContainer` still contained remnants of code that suggested
it was designed to handle cases where more than the drawable supplied to
it contained more than one `ISerialisableDrawableContainer`, or even
zero.

The zero path is totally dead right now (because every
`SkinComponentsContainer` is *by necessity* an
`ISerialisableDrawableContainer`), and the more-than-one path is dead
*for now* (and potentially forever?). Therefore, just hard-couple
`SkinBlueprintContainer` to receive a single target container.
2023-03-04 13:33:21 +01:00
Bartłomiej Dach
2f25fb4083
Move NonSkinnableScreenPlaceholder to outer scope 2023-03-04 13:22:43 +01:00
Bartłomiej Dach
15409b9c15
Fix skin selection not clearing on exit to non-skinnable screen 2023-03-04 13:18:34 +01:00
mk56-spn
2b7111867c Adjust reversion header text naming. 2023-03-03 15:12:20 +01:00
mk56-spn
90227a6496 Rename DeleteConfirmationDialog.cs into DangerousActionDialog.cs 2023-02-27 21:57:59 +01:00
mk56-spn
00a00ead22 Make ResetConfirmDialog inherit from DeleteConfirmationDialog 2023-02-27 21:50:27 +01:00
mk56-spn
1239de6f41 Upper case web using alias 2023-02-27 21:34:07 +01:00
mk56-spn
bf1897a98f Adjust warning text slightly. 2023-02-27 16:08:14 +01:00
mk56-spn
ff0d1aa9f7 Make reverting changes to a given skin into a "dangerous action" 2023-02-26 20:38:50 +01:00
Dean Herbert
dc3c1150b8 Set better defaults for SkinBlueprint transforms 2023-02-23 21:10:15 +09:00
Dean Herbert
c48aceb055 Fix undo history not being batched correctly for depth change operations 2023-02-23 20:03:36 +09:00
Dean Herbert
16c8a392a1 Add ability to send selected skin components to front or back 2023-02-22 18:17:20 +09:00
Bartłomiej Dach
051eb18b33
Merge branch 'master' into skin-editor-layer-select 2023-02-21 21:38:51 +01:00
Bartłomiej Dach
ec1bf7b0b2
Merge branch 'master' into skin-editor-clipboard 2023-02-21 19:35:58 +01:00
Dean Herbert
af062e7a68 Change placeComponent to only add to selection, not clear an existing selection 2023-02-21 14:11:18 +09:00
Dean Herbert
0d229d959b Remove unnecessary TriggerChange call 2023-02-21 13:50:19 +09:00
Bartłomiej Dach
6799492596
Merge branch 'master' into skin-editor-layer-select 2023-02-20 21:33:48 +01:00
Dean Herbert
43d33d45ca Only add valid placed components to selected collection on paste 2023-02-20 20:02:43 +09:00
Dean Herbert
b68562b033 Make placeComponent resilient to missing dependencies 2023-02-20 20:00:12 +09:00
Dean Herbert
a9c7edd087 Remove copy pasted comment 2023-02-20 19:57:16 +09:00
Bartłomiej Dach
1ba1298850
Merge branch 'master' into blueprint-improve-visuals 2023-02-19 15:55:30 +01:00
Dean Herbert
d7381b762c Also tween origin position 2023-02-19 23:52:21 +09:00
Bartłomiej Dach
ea04c487f2
Merge branch 'master' into blueprint-labels-while-hovering 2023-02-18 15:57:30 +01:00
Bartłomiej Dach
fbea3e312f
Merge branch 'master' into skin-editor-improve-toolbox-hover 2023-02-18 10:02:02 +01:00
Bartłomiej Dach
2aa4481f68
Fix toolbox items spontaneously contracting after briefly losing hover
Reproduction scenario:

1. Hover a toolbox item
2. Unhover the item, but do not hover any other item (can be done by
   exiting the toolbox completely to the right)
3. Come back to the item hovered in step (1)
4. The item would spontaneously contract after a second
2023-02-17 22:54:11 +01:00
Bartłomiej Dach
b390fdb8cc
Remove unused field 2023-02-17 21:51:19 +01:00
Dean Herbert
0a018514e1 Make skin editor focus only one layer at a time 2023-02-17 19:27:16 +09:00
Dean Herbert
00fcee0c5a Add per-ruleset component toolbox and placement support 2023-02-17 19:27:16 +09:00
Dean Herbert
ba5a87ca04 Add basic target layer selection in skin editor 2023-02-17 19:27:16 +09:00
Dean Herbert
5ed038fbb3 Improve the feel of hovering toolbox component items 2023-02-17 19:26:03 +09:00
Dean Herbert
814080d982 Only show blueprint labels when hovering or selected 2023-02-17 19:23:52 +09:00
Dean Herbert
6c61c5f4a8 Fix selection on the edge of blueprints (in the new inflation area) failing 2023-02-17 18:19:46 +09:00
Dean Herbert
16d94b4ea2 Improve visuals of skin blueprint 2023-02-17 18:19:46 +09:00
Dean Herbert
925deb7ca5 Make skin editor clipboard shared between screens and skins to allow moving elements over 2023-02-15 19:35:37 +09:00
Dean Herbert
bc83b0c264 Fix clipboard changes not batching as undo steps 2023-02-15 19:35:22 +09:00
Dean Herbert
bcf2555545 Fix components having incorrect default positions 2023-02-15 19:34:42 +09:00
Dean Herbert
d653335b6f Add basic skin editor clipboard implementation 2023-02-15 19:28:42 +09:00
Dean Herbert
a92e42bb84 Rename SkinnableTargetContainer to SkinComponentsContainer
Also use full `SkinComponentsContainerLookup` instead of the sub-type.
This will potentially be useful once we bring in per-ruleset targets.
2023-02-15 18:37:41 +09:00
Dean Herbert
b1cf6d83d8 Move extension methods closer to serialisation classes 2023-02-15 18:37:41 +09:00
Dean Herbert
e61d2d571c Move the lookup type out of ISserialisableDrawableContainer 2023-02-15 18:37:41 +09:00
Dean Herbert
a7b47f6503 Rename ISkinnableTarget to ISerialisableDrawableContainer 2023-02-15 18:37:41 +09:00
Dean Herbert
d159d6b970 Rename ISkinnableDrawable to ISerialisableDrawable 2023-02-15 18:37:41 +09:00