fix #20942: Changing font from Emmentaler to Gonville doesn't update …

…time signature
musescore · May 2, 2013 · 2c78b3d · 2c78b3d
1 parent 6be7450
commit 2c78b3d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/libmscore/timesig.cpp b/libmscore/timesig.cpp
@@ -37,7 +37,7 @@ TimeSig::TimeSig(Score* s)
       _sig.set(0, 1);               // initialize to invalid
       _timeSigType   = TSIG_NORMAL;
       customText = false;
-      needLayout = true;
+      _needLayout = true;
       }
 
 //---------------------------------------------------------
@@ -54,7 +54,7 @@ void TimeSig::setSig(const Fraction& f, TimeSigType st)
             customText = false;
       _timeSigType = st;
 //      layout1();
-      needLayout = true;
+      _needLayout = true;
       }
 
 //---------------------------------------------------------
@@ -95,7 +95,7 @@ void TimeSig::setNumeratorString(const QString& a)
       customText = _numeratorString.isEmpty() != _denominatorString.isEmpty()
             || ( !_numeratorString.isEmpty() && _numeratorString != QString::number(_sig.numerator()) )
             || ( !_denominatorString.isEmpty() && _denominatorString != QString::number(_sig.denominator()) );
-      needLayout = true;
+      _needLayout = true;
       }
 
 //---------------------------------------------------------
@@ -109,7 +109,7 @@ void TimeSig::setDenominatorString(const QString& a)
       customText = _numeratorString.isEmpty() != _denominatorString.isEmpty()
             || ( !_numeratorString.isEmpty() && _numeratorString != QString::number(_sig.numerator()) )
             || ( !_denominatorString.isEmpty() && _denominatorString != QString::number(_sig.denominator()) );
-      needLayout = true;
+      _needLayout = true;
       }
 
 //---------------------------------------------------------
@@ -214,7 +214,7 @@ void TimeSig::read(XmlReader& e)
             else
                   _timeSigType = TSIG_NORMAL;
             }
-      needLayout = true;
+      _needLayout = true;
       }
 
 //---------------------------------------------------------
@@ -307,7 +307,7 @@ void TimeSig::layout1()
 
       pz *= im;                           // convert positions to raster units
       pn *= im;
-      needLayout = false;
+      _needLayout = false;
       // adjustReadPos();
       }
 
@@ -479,7 +479,7 @@ QVariant TimeSig::propertyDefault(P_ID id) const
 
 void TimeSig::spatiumChanged(qreal /*oldValue*/, qreal /*newValue*/)
       {
-      needLayout = true;
+      _needLayout = true;
       }
 
 //---------------------------------------------------------
@@ -488,7 +488,7 @@ void TimeSig::spatiumChanged(qreal /*oldValue*/, qreal /*newValue*/)
 
 void TimeSig::layout()
       {
-      if (needLayout)
+      if (_needLayout)
             layout1();
       }
 
diff --git a/libmscore/timesig.h b/libmscore/timesig.h
@@ -60,7 +60,7 @@ class TimeSig : public Element {
       Fraction _stretch;      // localSig / globalSig
       bool	_showCourtesySig;
       bool customText;        // if false, sz and sn are calculated from actualSig()
-      bool needLayout;
+      bool _needLayout;
       Groups _groups;
 
       void layout1();
@@ -117,6 +117,8 @@ class TimeSig : public Element {
       QVariant propertyDefault(P_ID id) const;
       virtual void spatiumChanged(qreal /*oldValue*/, qreal /*newValue*/);
 
+      void setNeedLayout(bool nl) { _needLayout = nl; }
+
       const Groups& groups() const    { return _groups; }
       void setGroups(const Groups& e) { _groups = e; }
       void undoSetGroups(const Groups& e);

diff --git a/libmscore/undo.cpp b/libmscore/undo.cpp
@@ -2489,6 +2489,14 @@ ChangeStyle::ChangeStyle(Score* s, const MStyle& st)
       {
       }
 
+static void updateTimeSigs(void*, Element* e)
+      {
+      if (e->type() == Element::TIMESIG) {
+            TimeSig* ts = static_cast<TimeSig*>(e);
+            ts->setNeedLayout(true);
+            }
+      }
+
 static void updateTextStyle2(void*, Element* e)
       {
       if (!e->isText())
@@ -2527,6 +2535,8 @@ void ChangeStyle::flip()
 
       if (score->styleB(ST_concertPitch) != style.valueB(ST_concertPitch))
             score->cmdConcertPitchChanged(style.valueB(ST_concertPitch), true);
+      if (score->styleSt(ST_MusicalSymbolFont) != style.valueSt(ST_MusicalSymbolFont))
+            score->scanElements(0, updateTimeSigs);
 
       score->setStyle(style);
       score->scanElements(0, updateTextStyle2);