fix #271198: Custom noteheads implementation for 2.3 #3640
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
|
The code compiles, but the drumset editor doesn't work. @lasconic please review the changes. I assume I did not enough changes for the correct fallback. |
lasconic
reviewed
Apr 27, 2018
fonts/mscore/glyphnames.json
Outdated
| @@ -745,5 +743,81 @@ | |||
| }, | |||
| "noteLongaSquareUp": { | |||
| "codepoint": "U+e1c4" | |||
| }, | |||
There was a problem hiding this comment.
I'm just starting, so maybe I miss something but if the font doesn't have these glyphs, then they shouldn't be listed here.
anatoly-os
force-pushed
the
CustomNoteheads23
branch
2 times, most recently
from
7f0839a
to
88f6e06
Compare
Manually merged changes from musescore#3653 to 2.3
anatoly-os
force-pushed
the
CustomNoteheads23
branch
3 times, most recently
from
7496bdf
to
61e5bf1
Compare
lasconic
reviewed
May 11, 2018
fonts/mscore/glyphnames.json
Outdated
| @@ -732,8 +732,6 @@ | |||
| "ornamentLinePrall": { | |||
| "codepoint": "U+e18d" | |||
| }, | |||
|
|
|||
lasconic
reviewed
May 11, 2018
mscore/editdrumset.cpp
Outdated
| QPainter painter(&image); | ||
| const QRectF& bbox = ScoreFont::fallbackFont()->bbox(id, 1); | ||
| //default scale is 1.3, use smaller scale for large noteheads symbols | ||
| qreal mag = std::min(1.3, std::min(w / bbox.width(), h / bbox.height())); |
There was a problem hiding this comment.
Maybe it's my retina display but 2.6 looks a lot better on my mac. Same for master btw.
Maybe we should use *qApp->devicePixelRatio()
There was a problem hiding this comment.
Thanks, will experiment with it.
lasconic
reviewed
May 11, 2018
mscore/editdrumset.cpp
Outdated
| @@ -102,14 +118,83 @@ EditDrumset::EditDrumset(const Drumset* ds, QWidget* parent) | |||
| pitchList->setColumnWidth(1, 60); | |||
| pitchList->setColumnWidth(2, 30); | |||
|
|
|||
| QStringList validNoteheadRanges = { "Noteheads", "Slash noteheads", "Round and square noteheads", "Shape note noteheads", "Shape note noteheads supplement" }; | |||
There was a problem hiding this comment.
"Shape note noteheads supplement" doesn't exist in 2.3
lasconic
reviewed
May 11, 2018
mscore/editdrumset.cpp
Outdated
| staffLine->setEnabled(enable); | ||
| stemDirection->setEnabled(enable); | ||
| drumNote->setEnabled(enable); | ||
| label_2->setEnabled(enable); |
There was a problem hiding this comment.
worth giving some meaningful names no ?
anatoly-os
force-pushed
the
CustomNoteheads23
branch
from
61e5bf1
to
d9fb78e
Compare
…or percussion instrument Added "Custom" item to noteheads combobox, removed "invalid" item, set selection at the first tree element when opening the drumset editor, added interaction between custom noteheads group and notehead group combobox, fixed tab order. Fixed drawing custom noteheads in preview window: Set cachedSymbol from current quarter note combobox value and added slot to update preview on chaning quarter value. Fixed shadow note drawing: Apply specific notehead from drumset data. Manually merged changes for drumset palette and editor from master See 0214736
anatoly-os
force-pushed
the
CustomNoteheads23
branch
from
d9fb78e
to
60283b0
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.
Based on #3631 + additional font fallback implementation.