Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MU3] Fix #314029: Order of Text styles in Inspector dropdown and Styles dialog is different #7036

Merged
merged 1 commit into from Dec 8, 2020

Conversation

Jojo-Schmitz
Copy link
Contributor

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Dec 7, 2020

one mtest fail waits for #7032 to get merged

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Dec 7, 2020

Inspector Text styles
inspector EditStyle

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Dec 7, 2020

Seems one of the two mtests failures is new and does seem related to this PR:
https://github.com/musescore/MuseScore/pull/7036/checks?check_run_id=1510793477#step:5:673

 2/61 Test  #1: tst_compat114 ....................***Failed    3.98 sec
--- /home/runner/work/MuseScore/MuseScore/mtest/libmscore/compat114/fingering-ref.mscx	2020-12-07 13:02:40.449217068 +0000
+++ fingering-test.mscx	2020-12-07 13:31:20.751233427 +0000
@@ -139,7 +139,7 @@
             <durationType>quarter</durationType>
             <Note>
               <Fingering>
-                <style>String Number</style>
+                <style>Instrument Change</style>
                 <text>2</text>
                 </Fingering>
               <pitch>55</pitch>
   <diff -u /home/runner/work/MuseScore/MuseScore/mtest/libmscore/compat114/fingering-ref.mscx fingering-test.mscx failed

Don't quite understand why though?

Tid::StringNumber was 10 before and is 36 after the changes of this PR
Tid::InstrumentChange was 36 before and is 10 now.

Even stranger: opening that fingering.mscx in this build shows that string to be "User-4", while opening the fingering-ref.mscx correctly shows "String Number"

Edit:
OK, found it, thanks to @MarcSabatella, a hardcoded 10 in read114.cpp's readFingering()...

@vpereverzev vpereverzev merged commit 1382cac into musescore:3.x Dec 8, 2020
@Jojo-Schmitz Jojo-Schmitz deleted the text-style-order branch December 8, 2020 15:14
igorkorsukov added a commit to igorkorsukov/MuseScore that referenced this pull request Feb 12, 2021
…n Inspector dropdown and Styles dialog is different
vpereverzev pushed a commit that referenced this pull request Feb 12, 2021
…or dropdown and Styles dialog is different
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants