Skip to content

Commit

Permalink
Fix GH#19371: Set text line's text color
Browse files Browse the repository at this point in the history
Backport of musescore#19393
  • Loading branch information
Jojo-Schmitz committed Sep 18, 2023
1 parent 432d8bd commit 2e06f96
Show file tree
Hide file tree
Showing 4 changed files with 225 additions and 2 deletions.
2 changes: 2 additions & 0 deletions libmscore/textlinebase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ void TextLineBaseSegment::layout()
}
_text->setPlacement(Placement::ABOVE);
_text->setTrack(track());
_text->setColor(textLineBase()->lineColor());
_text->layout();

if ((isSingleType() || isEndType())) {
Expand All @@ -286,6 +287,7 @@ void TextLineBaseSegment::layout()
_endText->setStrike(tl->endFontStyle() & FontStyle::Strike);
_endText->setPlacement(Placement::ABOVE);
_endText->setTrack(track());
_endText->setColor(textLineBase()->lineColor());
_endText->layout();
}
else {
Expand Down
2 changes: 1 addition & 1 deletion vtest/gen
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ else
frametext ottava bend-1 \
barline-1 barline-2 instrument-1 symbol-1 \
slurs-1 slurs-2 slurs-3 slurs-4 slurs-5 slurs-6 slurs-7 slurs-8 slurs-9 slurs-10 \
hairpins-1 pedal-1 line-1 line-2 line-3 line-4 line-5 line-6 line-7 gliss-1 gliss-2 gliss-3 \
hairpins-1 pedal-1 line-1 line-2 line-3 line-4 line-5 line-6 line-7 line-colored line-dashed gliss-1 gliss-2 gliss-3 \
chord-layout-1 chord-layout-2 chord-layout-3 chord-layout-4 chord-layout-5\
chord-layout-6 chord-layout-7 chord-layout-8 chord-layout-9 chord-layout-10\
chord-layout-11 chord-layout-12 chord-layout-13 chord-layout-14 chord-layout-15 chord-layout-16 chord-layout-17\
Expand Down
2 changes: 1 addition & 1 deletion vtest/gen.bat
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ set SRC=bravura-mmrest,gonville-mmrest, ^
emmentaler-text-3,gonville-text-3,bravura-text-3,musejazz-text-3, ^
frametext,ottava,bend-1, ^
barline-1,barline-2,instrument-1,symbol-1, ^
slurs-1,slurs-2,slurs-3,slurs-4,hairpins-1,pedal-1,line-1,line-2,line-3,line-4,line-5,line-6,line-7,gliss-1,gliss-2,gliss-3, ^
slurs-1,slurs-2,slurs-3,slurs-4,hairpins-1,pedal-1,line-1,line-2,line-3,line-4,line-5,line-6,line-7,line-colored,line-dashed,gliss-1,gliss-2,gliss-3, ^
chord-layout-1,chord-layout-2,chord-layout-3,chord-layout-4,chord-layout-5, ^
chord-layout-6,chord-layout-7,chord-layout-8,chord-layout-9,chord-layout-10, ^
chord-layout-11,chord-layout-12,chord-layout-13,chord-layout-14,chord-layout-15,chord-layout-16,chord-layout-17, ^
Expand Down
221 changes: 221 additions & 0 deletions vtest/line-colour.mscx
Original file line number Diff line number Diff line change
@@ -0,0 +1,221 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<programVersion>3.6.2</programVersion>
<programRevision>3224f34</programRevision>
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
<Division>480</Division>
<Style>
<pageWidth>1.7689</pageWidth>
<pageHeight>1.18346</pageHeight>
<pagePrintableWidth>1.7689</pagePrintableWidth>
<pageEvenLeftMargin>0</pageEvenLeftMargin>
<pageOddLeftMargin>0</pageOddLeftMargin>
<pageEvenTopMargin>0.590551</pageEvenTopMargin>
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0</pageOddTopMargin>
<pageOddBottomMargin>0</pageOddBottomMargin>
<enableVerticalSpread>1</enableVerticalSpread>
<lyricsMinBottomDistance>1.5</lyricsMinBottomDistance>
<lyricsDashLineThickness>0.1</lyricsDashLineThickness>
<minMeasureWidth>8</minMeasureWidth>
<doubleBarDistance>0.37</doubleBarDistance>
<endBarDistance>0.37</endBarDistance>
<repeatBarlineDotSeparation>0.37</repeatBarlineDotSeparation>
<bracketWidth>0.45</bracketWidth>
<bracketDistance>0.45</bracketDistance>
<akkoladeWidth>1.5</akkoladeWidth>
<akkoladeBarDistance>0.35</akkoladeBarDistance>
<clefLeftMargin>0.75</clefLeftMargin>
<stemWidth>0.1</stemWidth>
<shortestStem>2.5</shortestStem>
<minNoteDistance>0.5</minNoteDistance>
<measureSpacing>1.5</measureSpacing>
<ledgerLineLength>0.33</ledgerLineLength>
<beamDistance>0</beamDistance>
<beamMinLen>1.1</beamMinLen>
<propertyDistanceHead>0.4</propertyDistanceHead>
<propertyDistanceStem>0.4</propertyDistanceStem>
<propertyDistance>0.4</propertyDistance>
<articulationAnchorLuteFingering>1</articulationAnchorLuteFingering>
<hairpinLinePosAbove x="0" y="-1.5"/>
<hairpinLinePosBelow x="0" y="2.5"/>
<hairpinLineStyle>0</hairpinLineStyle>
<hairpinLineLineStyle>0</hairpinLineLineStyle>
<pedalListStyle>0</pedalListStyle>
<chordSymbolAFontSize>10</chordSymbolAFontSize>
<chordSymbolBFontSize>10</chordSymbolBFontSize>
<minMMRestWidth>6</minMMRestWidth>
<mmRestNumberPos>-0.5</mmRestNumberPos>
<slurEndWidth>0.05</slurEndWidth>
<evenFooterC>$C</evenFooterC>
<oddFooterC>$C</oddFooterC>
<voltaLineStyle>0</voltaLineStyle>
<ottavaLineStyle>0</ottavaLineStyle>
<tupletStemLeftDistance>0.5</tupletStemLeftDistance>
<tupletNoteLeftDistance>0</tupletNoteLeftDistance>
<scaleBarlines>0</scaleBarlines>
<subTitleFontSize>14</subTitleFontSize>
<dynamicsFontSize>10</dynamicsFontSize>
<measureNumberPosBelow x="0" y="1"/>
<headerAlign>center,top</headerAlign>
<footerAlign>center,bottom</footerAlign>
<letRingLineWidth>0.11</letRingLineWidth>
<letRingLineStyle>0</letRingLineStyle>
<palmMutePosAbove x="0" y="0"/>
<palmMutePosBelow x="0" y="0"/>
<palmMuteLineWidth>0.11</palmMuteLineWidth>
<palmMuteLineStyle>0</palmMuteLineStyle>
<articulationMinDistance>0.4</articulationMinDistance>
<defaultsVersion>410</defaultsVersion>
<Spatium>1.74978</Spatium>
</Style>
<showInvisible>1</showInvisible>
<showUnprintable>1</showUnprintable>
<showFrames>1</showFrames>
<showMargins>0</showMargins>
<metaTag name="arranger"></metaTag>
<metaTag name="composer">Composer / arranger</metaTag>
<metaTag name="copyright"></metaTag>
<metaTag name="creationDate">2023-09-13</metaTag>
<metaTag name="lyricist"></metaTag>
<metaTag name="movementNumber"></metaTag>
<metaTag name="movementTitle"></metaTag>
<metaTag name="platform">Apple Macintosh</metaTag>
<metaTag name="poet"></metaTag>
<metaTag name="source"></metaTag>
<metaTag name="translator"></metaTag>
<metaTag name="workNumber"></metaTag>
<metaTag name="workTitle">Untitled score</metaTag>
<Order id="orchestral" customized="1">
<name>Orchestral</name>
<instrument id="flute">
<family id="flutes">Flöten</family>
</instrument>
<section id="woodwind" brackets="true" showSystemMarkings="true" barLineSpan="true" thinBrackets="true">
<family>flutes</family>
<family>oboes</family>
<family>clarinets</family>
<family>saxophones</family>
<family>bassoons</family>
<unsorted group="woodwinds"/>
</section>
<section id="brass" brackets="true" showSystemMarkings="false" barLineSpan="true" thinBrackets="true">
<family>horns</family>
<family>trumpets</family>
<family>cornets</family>
<family>flugelhorns</family>
<family>trombones</family>
<family>tubas</family>
</section>
<section id="timpani" brackets="true" showSystemMarkings="false" barLineSpan="true" thinBrackets="true">
<family>timpani</family>
</section>
<section id="percussion" brackets="true" showSystemMarkings="false" barLineSpan="true" thinBrackets="true">
<family>keyboard-percussion</family>
<family>drums</family>
<family>unpitched-metal-percussion</family>
<family>unpitched-wooden-percussion</family>
<family>other-percussion</family>
</section>
<family>keyboards</family>
<family>harps</family>
<family>organs</family>
<family>synths</family>
<section id="plucked-strings" brackets="true" showSystemMarkings="false" barLineSpan="true" thinBrackets="true">
<family>plucked-strings</family>
</section>
<soloists/>
<section id="voices" brackets="true" showSystemMarkings="false" barLineSpan="false" thinBrackets="true">
<family>voices</family>
</section>
<section id="strings" brackets="true" showSystemMarkings="true" barLineSpan="true" thinBrackets="true">
<family>orchestral-strings</family>
</section>
<unsorted/>
</Order>
<Part>
<Staff id="1">
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
</Staff>
<trackName>Flute</trackName>
<Instrument id="flute">
<longName>Flute</longName>
<shortName>Fl.</shortName>
<trackName>Flute</trackName>
<minPitchP>59</minPitchP>
<maxPitchP>98</maxPitchP>
<minPitchA>60</minPitchA>
<maxPitchA>93</maxPitchA>
<instrumentId>wind.flutes.flute</instrumentId>
<Channel>
<controller ctrl="0" value="0"/>
<controller ctrl="32" value="17"/>
<program value="73"/>
<synti>Fluid</synti>
</Channel>
</Instrument>
</Part>
<Staff id="1">
<Measure>
<voice>
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
</TimeSig>
<Spanner type="Ottava">
<Ottava>
<subtype>8va</subtype>
<color r="255" g="64" b="255" a="255"/>
<lineStyle>2</lineStyle>
<color r="255" g="64" b="255" a="255"/>
</Ottava>
<next>
<location>
<fractions>1/1</fractions>
</location>
</next>
</Spanner>
<Chord>
<durationType>quarter</durationType>
<Note>
<pitch>74</pitch>
<tpc>16</tpc>
</Note>
</Chord>
<Chord>
<durationType>quarter</durationType>
<Note>
<pitch>74</pitch>
<tpc>16</tpc>
</Note>
</Chord>
<Chord>
<durationType>quarter</durationType>
<Note>
<pitch>74</pitch>
<tpc>16</tpc>
</Note>
</Chord>
<Chord>
<durationType>quarter</durationType>
<Note>
<pitch>74</pitch>
<tpc>16</tpc>
</Note>
</Chord>
<Spanner type="Ottava">
<prev>
<location>
<fractions>-1/1</fractions>
</location>
</prev>
</Spanner>
</voice>
</Measure>
</Staff>
</Score>
</museScore>

0 comments on commit 2e06f96

Please sign in to comment.