Revert repeat marker musical symbols scale changes #24914
+1,497
−1,471
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
miiizen
force-pushed
the
24330-repeats-size
branch
from
272e4f9
to
058263c
Compare
miiizen
force-pushed
the
24330-repeats-size
branch
from
d0abd0f
to
093a3eb
Compare
oktophonie
approved these changes
Sep 26, 2024
mike-spa
reviewed
Sep 27, 2024
src/engraving/rw/read410/tread.cpp
Outdated
| @@ -1875,6 +1875,11 @@ void TRead::read(Marker* m, XmlReader& e, ReadContext& ctx) | |||
| e.unknown(); | |||
| } | |||
| } | |||
| const bool needsAdjustMarkerSize = m->score()->mscVersion() == 440 && m->score()->mscoreVersion() != u"4.4.3" && !ctx.pasteMode(); | |||
| const bool isDefualtSize = m->score()->style().styleD(Sid::repeatLeftFontSize) == 11.0; | |||
mike-spa
reviewed
Sep 27, 2024
| element->styleChanged(); | ||
|
|
||
| // from 4.4.3 markers have a font size which is not the default, so this must be reset after calling style changed | ||
| if (item->isMarker() && toMarker(item)->size() == 11) { |
There was a problem hiding this comment.
I'm not sure I understand what is going on here. Using 11 and 18 like this looks a bit magic numbers to me (same for the TRead code above) as I don't know the context. They should be in a variable (or at least have an explanatory comment).
Speaking of comment: what do you mean that markers have a font size which is not the default? Shouldn't an element inserted into the score from the default palettes have default settings by definition?
This reverts commit 8f28568.
miiizen
force-pushed
the
24330-repeats-size
branch
from
093a3eb
to
caf2933
Compare
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: #24330
Resolves: #24899
This reverts #21758 and adds some compatibility code for reading 4.4.0-2 files & palettes.