Prevent custom divisor ranges from halting divisor preset cycling #26689
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
A custom divisor like 24 or 32 will result in a range containing many divisors that are already in the `Common` and `Triplets` presets. When this happens, it can become impossible to cycle between presets, because the preset can only be changed if the new divisor isn't already contained within the current preset's range.
|
Please avoid force pushing in the future. |
peppy
reviewed
Jan 25, 2024
| @@ -29,10 +29,11 @@ public BindableBeatDivisor(int value = 1) | |||
| /// Set a divisor, updating the valid divisor range appropriately. | |||
| /// </summary> | |||
| /// <param name="divisor">The intended divisor.</param> | |||
| public void SetArbitraryDivisor(int divisor) | |||
| /// <param name="force">Ignores the current valid divisor range when true.</param> | |||
There was a problem hiding this comment.
This reads wrong. Don't you mean "forces changing the valid divisors to a common preset"? I'd probably name this variable preferKnownPresets or experiment with extracting the logic out to a second method for this, called something like SetPresetsForDivisor(int divisor).
peppy
approved these changes
Jan 25, 2024
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.
In the editor, if we enter a custom divisor of 24, it creates a custom divisor preset with the range:
{1, 2, 3, 4, 6, 8, 12, 24}Then, when we try to switch back to the "common" or "triplets" presets, the divisor changes to the default value of those presets, but we're still stuck in the custom preset.
This happens because the custom preset contains both 4 and 6, and the preset will not change if the current valid divisor range already contains the proposed value. So the only way to manually break out of the custom preset is to enter a new custom divisor whose preset range won't contain 4 or 6.
This PR allows the current valid divisor range check to be skipped when cycling through presets.