LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5037 from jthistle/289374-tuplet-size-spatium-dep

Browse source 
fix #289374: tuplet numbers: 'follow staff size' not working
This commit is contained in:
anatoly-os 2019-09-03 11:02:12 +02:00 committed by GitHub
commit 543c94f8b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 180 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libmscore/read206.cpp
View file

@ -1749,7 +1749,7 @@ static void readTuplet(Tuplet* tuplet, XmlReader& e)
_number->setVisible(tuplet->visible()); //?? override saved property
_number->setTrack(tuplet->track());
// move property flags from _number
for (auto p : { Pid::FONT_FACE, Pid::FONT_SIZE, Pid::FONT_STYLE, Pid::ALIGN })
for (auto p : { Pid::FONT_FACE, Pid::FONT_SIZE, Pid::FONT_STYLE, Pid::ALIGN, Pid::SIZE_SPATIUM_DEPENDENT })
tuplet->setPropertyFlags(p, _number->propertyFlags(p));
}
else if (!readTupletProperties206(e, tuplet))

7
libmscore/tuplet.cpp
View file

@ -41,6 +41,7 @@ static const ElementStyle tupletStyle {
{ Sid::tupletFontStyle, Pid::FONT_STYLE },
{ Sid::tupletAlign, Pid::ALIGN },
{ Sid::tupletMinDistance, Pid::MIN_DISTANCE },
{ Sid::tupletFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT },
};
//---------------------------------------------------------
@ -150,7 +151,7 @@ Fraction Tuplet::rtick() const
void Tuplet::resetNumberProperty()
{
for (auto p : { Pid::FONT_FACE, Pid::FONT_STYLE, Pid::FONT_SIZE, Pid::ALIGN })
for (auto p : { Pid::FONT_FACE, Pid::FONT_STYLE, Pid::FONT_SIZE, Pid::ALIGN, Pid::SIZE_SPATIUM_DEPENDENT })
_number->resetProperty(p);
}
@ -1064,6 +1065,7 @@ QVariant Tuplet::getProperty(Pid propertyId) const
case Pid::FONT_FACE:
case Pid::FONT_STYLE:
case Pid::ALIGN:
case Pid::SIZE_SPATIUM_DEPENDENT:
return _number ? _number->getProperty(propertyId) : QVariant();
default:
break;
@ -1106,6 +1108,7 @@ bool Tuplet::setProperty(Pid propertyId, const QVariant& v)
case Pid::FONT_FACE:
case Pid::FONT_STYLE:
case Pid::ALIGN:
case Pid::SIZE_SPATIUM_DEPENDENT:
if (_number)
_number->setProperty(propertyId, v);
break;
@ -1146,6 +1149,8 @@ QVariant Tuplet::propertyDefault(Pid id) const
return score()->styleV(Sid::tupletFontSize);
case Pid::FONT_STYLE:
return score()->styleV(Sid::tupletFontStyle);
case Pid::SIZE_SPATIUM_DEPENDENT:
return score()->styleV(Sid::tupletFontSpatiumDependent);
default:
{
QVariant v = ScoreElement::propertyDefault(id, Tid::DEFAULT);

3
mscore/inspector/inspector.cpp
View file

@ -844,7 +844,8 @@ InspectorTuplet::InspectorTuplet(QWidget* parent)
{ Pid::DIRECTION, 0, t.direction, t.resetDirection },
{ Pid::NUMBER_TYPE, 0, t.numberType, t.resetNumberType },
{ Pid::BRACKET_TYPE, 0, t.bracketType, t.resetBracketType },
{ Pid::LINE_WIDTH, 0, t.lineWidth, t.resetLineWidth }
{ Pid::LINE_WIDTH, 0, t.lineWidth, t.resetLineWidth },
{ Pid::SIZE_SPATIUM_DEPENDENT, 0, t.spatiumDependent, t.resetSpatiumDependent },
};
const std::vector<InspectorPanel> ppList = { {t.title, t.panel} };
mapSignals(iiList, ppList);

334
mscore/inspector/inspector_tuplet.ui
View file

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>279</width>
<width>304</width>
<height>288</height>
</rect>
</property>
@ -61,48 +61,26 @@
<item>
<widget class="QWidget" name="panel" native="true">
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
<number>3</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<number>3</number>
</property>
<property name="spacing">
<number>3</number>
</property>
<item row="2" column="0">
<widget class="QLabel" name="label_2">
<item row="0" column="1">
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Bracket type:</string>
<string>Direction:</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>bracketType</cstring>
<cstring>direction</cstring>
</property>
</widget>
</item>
<item row="7" column="2">
<widget class="Ms::ResetButton" name="resetTupletFontStyle" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="accessibleName">
<string>Reset 'Style' values</string>
</property>
</widget>
</item>
<item row="0" column="1">
<item row="0" column="2">
<widget class="QComboBox" name="direction">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@ -130,50 +108,8 @@
</item>
</widget>
</item>
<item row="5" column="1">
<widget class="QFontComboBox" name="tupletFontFace">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Font face</string>
</property>
<property name="accessibleName">
<string>Font face</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Direction:</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>direction</cstring>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="Ms::FontStyleSelect" name="tupletFontStyle" native="true">
<property name="accessibleName">
<string>Style</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="Ms::ResetButton" name="resetBracketType" native="true">
<item row="0" column="3">
<widget class="Ms::ResetButton" name="resetDirection" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
@ -181,11 +117,24 @@
</sizepolicy>
</property>
<property name="accessibleName">
<string>Reset 'Bracket type' value</string>
<string>Reset 'Direction' value</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label">
<property name="text">
<string>Number type:</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>numberType</cstring>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QComboBox" name="numberType">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@ -213,33 +162,33 @@
</item>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Font:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QDoubleSpinBox" name="lineWidth">
<item row="1" column="3">
<widget class="Ms::ResetButton" name="resetNumberType" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="accessibleName">
<string>Line thickness</string>
</property>
<property name="suffix">
<string>sp</string>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
<string>Reset 'Number type' value</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Bracket type:</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>bracketType</cstring>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QComboBox" name="bracketType">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@ -267,20 +216,115 @@
</item>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label">
<item row="2" column="3">
<widget class="Ms::ResetButton" name="resetBracketType" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="accessibleName">
<string>Reset 'Bracket type' value</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Number type:</string>
<string>Line thickness:</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>numberType</cstring>
<cstring>lineWidth</cstring>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QDoubleSpinBox" name="lineWidth">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="accessibleName">
<string>Line thickness</string>
</property>
<property name="suffix">
<string>sp</string>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
</property>
</widget>
</item>
<item row="3" column="3">
<widget class="Ms::ResetButton" name="resetLineWidth" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="accessibleName">
<string>Reset 'Line thickness' value</string>
</property>
</widget>
</item>
<item row="4" column="1" colspan="3">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Font:</string>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QFontComboBox" name="tupletFontFace">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Font face</string>
</property>
<property name="accessibleName">
<string>Font face</string>
</property>
</widget>
</item>
<item row="5" column="3">
<widget class="Ms::ResetButton" name="resetTupletFontFace" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="accessibleName">
<string>Reset 'Font' value</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Size:</string>
</property>
</widget>
</item>
<item row="6" column="2">
<widget class="QSpinBox" name="tupletFontSize">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@ -302,40 +346,7 @@
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Style:</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="Ms::ResetButton" name="resetNumberType" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="accessibleName">
<string>Reset 'Number type' value</string>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="Ms::ResetButton" name="resetTupletFontFace" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="accessibleName">
<string>Reset 'Font' value</string>
</property>
</widget>
</item>
<item row="6" column="2">
<item row="6" column="3">
<widget class="Ms::ResetButton" name="resetTupletFontSize" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@ -348,8 +359,22 @@
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="Ms::ResetButton" name="resetLineWidth" native="true">
<item row="7" column="1">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Style:</string>
</property>
</widget>
</item>
<item row="7" column="2">
<widget class="Ms::FontStyleSelect" name="tupletFontStyle" native="true">
<property name="accessibleName">
<string>Style</string>
</property>
</widget>
</item>
<item row="7" column="3">
<widget class="Ms::ResetButton" name="resetTupletFontStyle" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
@ -357,32 +382,22 @@
</sizepolicy>
</property>
<property name="accessibleName">
<string>Reset 'Line thickness' value</string>
<string>Reset 'Style' values</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_6">
<item row="8" column="1" colspan="2">
<widget class="QCheckBox" name="spatiumDependent">
<property name="accessibleName">
<string>Follow staff size</string>
</property>
<property name="text">
<string>Size:</string>
<string>Follow staff size</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Line thickness:</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>lineWidth</cstring>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="Ms::ResetButton" name="resetDirection" native="true">
<item row="8" column="3">
<widget class="Ms::ResetButton" name="resetSpatiumDependent" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
@ -390,14 +405,7 @@
</sizepolicy>
</property>
<property name="accessibleName">
<string>Reset 'Direction' value</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="3">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<string>Reset 'Follow staff size' values</string>
</property>
</widget>
</item>