A deep overhaul of dynamics and expression #17001
Merged
Conversation
This file contains hidden or 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
mike-spa
force-pushed
the
unjankifyDynamics
branch
7 times, most recently
from
8aec753 to
0d3b133
Compare
mike-spa
force-pushed
the
unjankifyDynamics
branch
16 times, most recently
from
890c118 to
35c8fdd
Compare
src/inspector/models/notation/dynamics/dynamicsettingsmodel.cpp
Outdated
Show resolved
Hide resolved
src/inspector/models/notation/expressions/expressionsettingsmodel.cpp
Outdated
Show resolved
Hide resolved
mike-spa
force-pushed
the
unjankifyDynamics
branch
4 times, most recently
from
4d34407 to
6fa289b
Compare
Closed
mike-spa
force-pushed
the
unjankifyDynamics
branch
from
6fa289b to
e84347b
Compare
mike-spa
force-pushed
the
unjankifyDynamics
branch
2 times, most recently
from
34d0d4f to
5357c65
Compare
mike-spa
changed the title
mike-spa
force-pushed
the
unjankifyDynamics
branch
from
5357c65 to
adc699a
Compare
its-not-nice
approved these changes
Apr 28, 2023
1. Don't automatically flag as "other" dynamic with text. As long as the string contains the substring identifying the dynamic type, we should retain the type. NOTE: this also resolves the issue that dynamics with text don't have playback. 2. Keep dynamics aligned properly (i.e. dynamic under the notehead) when custom text is added. This is now the defaul, with an option to revert to old behaviour. 3. Offset dynamis laterally to avoide collision with barlines (with toggle/untoggle option). In general, dynamics must be detached from text settings. Specifically: 4. Dynamics symbols now have the possibility to override the score music font (independently of text font) 5. Dynamics symbols can have custom size (independent from text size) expressed as a percentage of the default. 6. Dynamics text (i.e. text typed into a dynamic) must be treated as expression text, and it now takes all its defaults from there. The Style -> Text Styles -> Dynamics page has been removed. 7. Expressions have a new dedicated class of their own. "Old" expressions, i.e. staff text with an "expression" style, are mapped into the new expression item preserving the old layout. 8. Expressions entered on the same chord as a dynamic mark will automatically align to the dynamic (with toggle/untoggle option). 9. An expression + dynamics snapped pair is dragged together. 10. Long awaited quality-of-life improvement: when dropping (or clicking and entering) a new dynamic onto an existing one, it will replace the old one with the new one (instead of having to delete and re-enter to change a dynamic). 11. A new inspector panel for Dynamics, containing all the relevant applicable settings. Some of these settings are moved here from the Text inspector panel, mainly the Above - Below and the Frame Settings. 12. The Text inspector panel is not shown when a "pure" dynamic is selected. It is only shown when a dynamic+custom text is selected, and the options only refer to the text part. 13. New options in the Style -> Dynamics submenu. 14. A new inspector panel for Expressions, containing (for now) only the "Snap to dynamics" option.
added vtest
mike-spa
force-pushed
the
unjankifyDynamics
branch
from
adc699a to
6901e6e
Compare
RomanPudashkin
approved these changes
Apr 28, 2023
7 tasks
Merged
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.
Resolves: #16900 (among many other things)
Summary:
Don't automatically flag as "other" dynamics with text. As long as the string contains the substring identifying the dynamic type, we should retain the type. NOTE: this also resolves the issue that dynamics with text don't have playback.
Keep dynamics aligned properly (i.e. dynamic under the notehead) when custom text is added. This is now the default, with an option to revert to old behaviour.
Offset dynamics laterally to avoide collision with barlines (with toggle/untoggle option).
In general, dynamics must be detached from text settings. Specifically:
Dynamics symbols now have the possibility to override the score music font (independently of text font)
Dynamics symbols can have custom size (independent from text size) expressed as a percentage of the default.
Dynamics text (i.e. text typed into a dynamic) must be treated as expression text, and it now takes all its defaults from there. The Style -> Text Styles -> Dynamics page has been removed.
Expressions have a new dedicated class of their own. "Old" expressions, i.e. staff text with an "expression" style, are mapped into the new expression item preserving the old layout.
Expressions entered on the same chord as a dynamic mark will automatically align to the dynamic (with toggle/untoggle option).
An expression + dynamics snapped pair is dragged together.
Long awaited quality-of-life improvement: when dropping (or clicking and entering) a new dynamic onto an existing one, it will replace the old one with the new one (instead of having to delete and re-enter to change a dynamic).
A new inspector panel for Dynamics, containing all the relevant applicable settings. Some of these settings are moved here from the Text inspector panel, mainly the Above - Below and the Frame Settings.
The Text inspector panel is not shown when a "pure" dynamic is selected. It is only shown when a dynamic+custom text is selected, and the options only refer to the text part.
New options in the Style -> Dynamics submenu.
A new inspector panel for Expressions, containing (for now) only the "Snap to dynamics" option.
20230428_143610.mp4
20230428_144523.mp4