File: fix-lyrics-even-style.diff

package info (click to toggle)
musescore3 3.2.3%2Bdfsg2-21
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 219,852 kB
  • sloc: cpp: 291,412; xml: 200,226; sh: 3,779; ansic: 1,447; python: 393; makefile: 246; perl: 82; pascal: 79
file content (28 lines) | stat: -rw-r--r-- 1,794 bytes parent folder | download | duplicates (3)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
Origin: upstream, commit:fac2d4f396816a9449a7565f6b68b2326e814c98
Author: Joachim Schmitz <jojo@schmitz-digital.de>
Description: fix #290947: Lyrics: frame, border and highlight styling regressions
 .
 where these for even lyrics can't get set and if tried odd lyrics are
 getting set instead

--- a/libmscore/style.cpp
+++ b/libmscore/style.cpp
@@ -116,12 +116,12 @@ static const StyleType styleTypes[] {
       { Sid::lyricsEvenFontStyle,     "lyricsEvenFontStyle",     int(FontStyle::Normal) },
       { Sid::lyricsEvenColor,         "lyricsEvenColor",         QColor(0, 0, 0, 255) },
       { Sid::lyricsEvenAlign,         "lyricsEvenAlign",         QVariant::fromValue(Align::HCENTER | Align::BASELINE) },
-      { Sid::lyricsEvenFrameType,     "lyricsOddFrameType",      int(FrameType::NO_FRAME) },
-      { Sid::lyricsEvenFramePadding,  "lyricsOddFramePadding",   0.2 },
-      { Sid::lyricsEvenFrameWidth,    "lyricsOddFrameWidth",     0.1 },
-      { Sid::lyricsEvenFrameRound,    "lyricsOddFrameRound",     0 },
-      { Sid::lyricsEvenFrameFgColor,  "lyricsOddFrameFgColor",   QColor(0, 0, 0, 255) },
-      { Sid::lyricsEvenFrameBgColor,  "lyricsOddFrameBgColor",   QColor(255, 255, 255, 0) },
+      { Sid::lyricsEvenFrameType,     "lyricsEvenFrameType",     int(FrameType::NO_FRAME) },
+      { Sid::lyricsEvenFramePadding,  "lyricsEvenFramePadding",  0.2 },
+      { Sid::lyricsEvenFrameWidth,    "lyricsEvenFrameWidth",    0.1 },
+      { Sid::lyricsEvenFrameRound,    "lyricsEvenFrameRound",    0 },
+      { Sid::lyricsEvenFrameFgColor,  "lyricsEvenFrameFgColor",  QColor(0, 0, 0, 255) },
+      { Sid::lyricsEvenFrameBgColor,  "lyricsEvenFrameBgColor",  QColor(255, 255, 255, 0) },
 
       { Sid::figuredBassFontFamily,   "figuredBassFontFamily",   QString("MScoreBC") },