Merge branch 'rochade' into master
[alioth/musescore.git] / debian / patches / upstream / ottava-size.diff
index e8e05c2..ab90d54 100644 (file)
@@ -1,15 +1,15 @@
-Origin: backport, commit:5301009829215619953d33f03932b09c3ead5e7b
+Origin: upstream, commit:5301009829215619953d33f03932b09c3ead5e7b
 Author: Joachim Schmitz <jojo@schmitz-digital.de>
 Description: fix #300738: Ottava (8va/8vb) number is too big
 
 --- a/libmscore/style.cpp
 +++ b/libmscore/style.cpp
-@@ -355,7 +355,7 @@ void initStyle(MStyle* s)
-       s->addTextStyle(TextStyle(QT_TRANSLATE_NOOP ("TextStyle", "Glissando"), ff, 8, false, true, false,
-          AlignmentFlags::HCENTER | AlignmentFlags::BASELINE, QPointF(), OffsetType::SPATIUM, true));
--      s->addTextStyle(TextStyle(QT_TRANSLATE_NOOP ("TextStyle", "Ottava"),            ff, 12, false, true, false,
-+      s->addTextStyle(TextStyle(QT_TRANSLATE_NOOP ("TextStyle", "Ottava"),            ff, 10, false, true, false,
-          AlignmentFlags::LEFT | AlignmentFlags::VCENTER, QPointF(), OffsetType::SPATIUM, true));
-       s->addTextStyle(TextStyle(QT_TRANSLATE_NOOP ("TextStyle", "Pedal"),             ff, 12, false, false, false,
-          AlignmentFlags::LEFT | AlignmentFlags::BASELINE, QPointF(0.0, 0.15), OffsetType::SPATIUM, true));
+@@ -447,7 +447,7 @@ static const StyleType styleTypes[] {
+       { Sid::ottavaLineStyle,         "ottavaLineStyle",         QVariant(int(Qt::DashLine)) },
+       { Sid::ottavaNumbersOnly,       "ottavaNumbersOnly",       true },
+       { Sid::ottavaFontFace,          "ottavaFontFace",          "FreeSerif" },
+-      { Sid::ottavaFontSize,          "ottavaFontSize",          12.0 },
++      { Sid::ottavaFontSize,          "ottavaFontSize",          10.0 },
+       { Sid::ottavaFontSpatiumDependent, "ottavaFontSpatiumDependent", true },
+       { Sid::ottavaFontStyle,         "ottavaFontStyle",         int(FontStyle::Normal) },
+       { Sid::ottavaColor,             "ottavaColor",             QColor(0, 0, 0, 255) },