Lyrics revamp and new options #22434
Conversation
mike-spa
force-pushed
the
lyricsRevampAndNewOptions
branch
2 times, most recently
from
9d88bb5
to
0dc7dae
Compare
mike-spa
force-pushed
the
lyricsRevampAndNewOptions
branch
from
0dc7dae
to
5765fdb
Compare
| @@ -509,6 +489,16 @@ void Lyrics::triggerLayout() const | |||
| } | |||
| } | |||
|
|
|||
| double Lyrics::yRelativeToStaff() const | |||
| { | |||
| return pos().y() + chordRest()->pos().y(); | |||
There was a problem hiding this comment.
Shouldn't it return multdata()->posY() instead?
There was a problem hiding this comment.
Yes it should, but because of this issue, I need this function to return the position including offset, hence why I need to use pos() instead of mutldata()->pos()
| @@ -4543,6 +4543,28 @@ ChordRest* Score::findCRinStaff(const Fraction& tick, staff_idx_t staffIdx) cons | |||
| return 0; | |||
| } | |||
|
|
|||
| ChordRest* Score::findChordRestEndingBeforeTickInTrack(const Fraction& tick, track_idx_t trackIdx) const | |||
| { | |||
| Measure* measure = tick2measureMM(tick - Fraction::eps()); | |||
There was a problem hiding this comment.
Could you please explain why we need to subtract eps() here?
There was a problem hiding this comment.
Because when tick falls exactly in-between two measures (meaning that one measure ends at tick and the next one starts at tick) tick2Measure returns the next one (which is what we want in 99% of cases). I'm subtracting eps() to make sure that I get the previous one in this case
src/engraving/dom/score.cpp
Outdated
| if (!segment->isChordRestType() || !segment->elementAt(trackIdx)) { | ||
| continue; | ||
| } | ||
| ChordRest* chordRest = toChordRest(segment->elementAt(trackIdx)); |
There was a problem hiding this comment.
It's better to call elemenetAt only once
src/engraving/dom/score.cpp
Outdated
| continue; | ||
| } | ||
| ChordRest* chordRest = toChordRest(segment->elementAt(trackIdx)); | ||
| chordRest->actualTicks().toString(); |
src/engraving/dom/score.cpp
Outdated
| return nullptr; | ||
| } | ||
|
|
||
| for (Segment* segment = measure->last(); segment; segment = segment->prev()) { |
| { | ||
| Shape& highResShape = mutldata()->highResShape.mut_value(); | ||
| highResShape.elements().reserve(m_text.size()); | ||
| highResShape.clear(); |
There was a problem hiding this comment.
It's better to call clear() before reserve()
| } | ||
|
|
||
| void LyricsLayout::setDefaultPositions(staff_idx_t staffIdx, LyricsVersesMap& lyricsVersesAbove, | ||
| LyricsVersesMap& lyricsVersesBelow, |
There was a problem hiding this comment.
Can you make these maps const here and elsewhere?
| LyricsVersesMap& lyricsVersesBelow) | ||
| { | ||
| double systemX = system->pageX(); | ||
| // HACK: subtract minVerticalDistance here because it's added later during staff distance calculations. Needs a better solution. |
There was a problem hiding this comment.
Are you going to replace it with a better solution? :)
There was a problem hiding this comment.
Yes, but the better solution means rewriting all the vertical spacing system, so I have to keep this for now :)
| return lyricsSkyline; | ||
| } | ||
|
|
||
| void LyricsLayout::moveThisVerseAndOuterOnes(int verse, int lastVerse, bool above, double diff, LyricsVersesMap lyricsVerses) |
There was a problem hiding this comment.
const LyricsVersesMap&
mike-spa
force-pushed
the
lyricsRevampAndNewOptions
branch
from
5765fdb
to
96a1ff5
Compare
mike-spa
force-pushed
the
lyricsRevampAndNewOptions
branch
from
96a1ff5
to
6c3324d
Compare
|
@mike-spa It's not possible to scroll with my touchpad inside the second column of the text styles page. Maybe a side effect of adding the anchor link to that page? 
|
Can you check if you have the same problem on the current master? I would be very weird if that caused it |
|
@mike-spa just checked and yes, it's in the 4.4 master so never mind :) |
Rewrite layout of melisma lines Rewrite layout of lyrics dashes Code corrections Add to skyline Code cleanup Introduce new lyrics dash and melisma options Implement min melisma length option Implement always force melisma option Implement lyrics dash options at start of system Implement dash option on first note of the system Remove all lyrics vertical positioning code more Rewrite lyrics vertical positioning Refactoring Cleanup unused code in stable layout Add padding on the outside of lyrics Introduce highRes shape for text base items Correction
mike-spa
force-pushed
the
lyricsRevampAndNewOptions
branch
from
6c3324d
to
b5fbd42
Compare
Resolves: #22432
Resolves: #21166
Resolves: #21045
#22181 Should be merged before this.