Fix regression in legend column assignments #50597
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
|
Not suitable for backporting |
when initially assigning columns to legend items Refs qgis#42672, but in itself causes regressions in the test suite. Basically, the existing logic has quite a number of errors and the column assignment resulting from it was unpredictable. It was mostly luck that the test suite passes, while other legend setups (such as that from qgis#42672) would give inferior column assignments.
This optimisation step is allowed to pack the earlier columns of a legend by shifting items back a column IF doing so results in a more compact legend, where EARLIER columns are more likely to take larger heights vs later columns. It's limited to run at most twice, in order to avoid doing too much work. Fixes qgis#42672
nyalldawson
force-pushed
the
fix_42672
branch
from
93352ab
to
c251a79
Compare
nirvn
approved these changes
Oct 20, 2022
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.
Since #39052 there's been a regression in the column assignment of some layout legends, where equal item heights will result in legend placements like:
This PR repairs the logic, an adds an optimisation step after legend column assignment. This optimisation step is allowed to pack the earlier columns of a legend by shifting items back a column IF doing so results in a more compact legend, where EARLIER columns are more likely to take larger heights vs later columns.
It's limited to run at most twice, in order to avoid doing too much work.
Fixes #42672