Allow ordering certain carousel panels behind others #31802
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
peppy
reviewed
Feb 6, 2025
| @@ -29,6 +29,12 @@ public sealed class CarouselItem : IComparable<CarouselItem> | |||
| /// </summary> | |||
| public float DrawHeight { get; set; } = DEFAULT_HEIGHT; | |||
|
|
|||
| /// <summary> | |||
| /// A number that defines the layer which this <see cref="CarouselItem"/> should be placed on depth-wise. | |||
| /// The higher the number, the farther the panel associated with this item is taken to the background. | |||
There was a problem hiding this comment.
Probably should mention that this is relative to other panels, rather than "to the background" (because it doesn't make too much sense when they are never really approaching any background).
| @@ -550,6 +550,9 @@ protected override void Update() | |||
| updateDisplayedRange(range); | |||
| } | |||
|
|
|||
| double selectedYPos = currentSelection?.CarouselItem?.CarouselYPosition ?? 0; | |||
| double maximumDistanceFromSelection = scroll.Panels.Select(p => Math.Abs(((ICarouselPanel)p).DrawYPosition - selectedYPos)).DefaultIfEmpty().Max(); | |||
There was a problem hiding this comment.
We can't run linq in Update as a rule. Why can't this just be scroll.Panels[^1]?
|
@frenzibyte I've applied fixes for the issues I pointed out. Please double-check everything still works as you expect. |
peppy
approved these changes
Feb 6, 2025
|
Seems to work fine, using |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There is no appropriate example to show where this helps currently, but this becomes more apparent during beatmap carousel transitions where beatmap difficulty panels may temporarily overlap with a beatmap set panel during transition, and at that point the difficulty panel should logically always be behind it. This is what this change aims to achieve.
I was considering to approach this with a virtual method computing the final depth value of each item, but I realised 99% of the logic is strongly attached to the internals of
Carousel, and I was between making the virtual method accept many parameters to not deal with those internals or expose them toBeatmapCarousel, both of which sound bad quality-wise.