OPTIMIZATION: Remove unnecessary calls to triggerLayoutAll

Backport of musescore#20141
Jojo-Schmitz · Nov 23, 2023 · 1d5b021 · 1d5b021
1 parent be80549
commit 1d5b021
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 30 deletions.
diff --git a/libmscore/element.cpp b/libmscore/element.cpp
@@ -1911,9 +1911,13 @@ void Element::triggerLayout() const
             score()->setLayout(tick(), staffIdx(), this);
       }
 
-//---------------------------------------------------------
+//----------------------------------------------------------------------
 //   triggerLayoutAll
-//---------------------------------------------------------
+//
+//   *************************** CAUTION *******************************
+//   This causes a layout of the entire score: extremely expensive and
+//   likely unnecessary! Consider overriding triggerLayout() instead.
+//----------------------------------------------------------------------
 
 void Element::triggerLayoutAll() const
       {

diff --git a/libmscore/figuredbass.cpp b/libmscore/figuredbass.cpp
@@ -712,7 +712,7 @@ bool FiguredBassItem::setProperty(Pid propertyId, const QVariant& v)
             default:
                   return Element::setProperty(propertyId, v);
             }
-      triggerLayoutAll();
+      triggerLayout();
       return true;
       }
 

diff --git a/libmscore/glissando.cpp b/libmscore/glissando.cpp
@@ -706,7 +706,7 @@ bool Glissando::setProperty(Pid propertyId, const QVariant& v)
                         return false;
                   break;
             }
-      triggerLayoutAll();
+      triggerLayout();
       return true;
       }
 

diff --git a/libmscore/layoutbreak.cpp b/libmscore/layoutbreak.cpp
@@ -14,6 +14,7 @@
 #include "score.h"
 #include "mscore.h"
 #include "xml.h"
+#include "measurebase.h"
 
 namespace Ms {
 
@@ -290,7 +291,9 @@ bool LayoutBreak::setProperty(Pid propertyId, const QVariant& v)
                         return false;
                   break;
             }
-      triggerLayoutAll();
+      triggerLayout();
+      if (parent() && measure()->next())
+            measure()->next()->triggerLayout();
       setGenerated(false);
       return true;
       }

diff --git a/libmscore/lyrics.cpp b/libmscore/lyrics.cpp
@@ -507,7 +507,9 @@ Element* Lyrics::drop(EditData& data)
 void Lyrics::endEdit(EditData& ed)
       {
       TextBase::endEdit(ed);
-      triggerLayoutAll();
+      triggerLayout();
+      if (_separator)
+            _separator->triggerLayout();
       }
 
 //---------------------------------------------------------

diff --git a/libmscore/lyricsline.cpp b/libmscore/lyricsline.cpp
@@ -303,7 +303,7 @@ bool LyricsLine::setProperty(Pid propertyId, const QVariant& v)
                         return false;
                   break;
             }
-      triggerLayoutAll();
+      triggerLayout();
       return true;
       }
 

diff --git a/libmscore/marker.cpp b/libmscore/marker.cpp
@@ -271,7 +271,7 @@ bool Marker::setProperty(Pid propertyId, const QVariant& v)
                         return false;
                   break;
             }
-      triggerLayoutAll();
+      triggerLayout();
       return true;
       }
 

diff --git a/libmscore/measurebase.cpp b/libmscore/measurebase.cpp
@@ -142,8 +142,6 @@ void MeasureBase::add(Element* e)
                         setLineBreak(false);
                         setSectionBreak(true);
                         setNoBreak(false);
-      //does not work with repeats: score()->tempomap()->setPause(endTick(), b->pause());
-                        triggerLayoutAll();
                         break;
                   case LayoutBreak::NOBREAK:
                         setPageBreak(false);
@@ -154,7 +152,6 @@ void MeasureBase::add(Element* e)
                   }
             if (next())
                   next()->triggerLayout();
-//            triggerLayoutAll();     // TODO
             }
       triggerLayout();
       _el.push_back(e);
@@ -179,16 +176,21 @@ void MeasureBase::remove(Element* el)
                   case LayoutBreak::SECTION:
                         setSectionBreak(false);
                         score()->setPause(endTick(), 0);
-                        triggerLayoutAll();
+                        triggerLayout();
                         break;
                   case LayoutBreak::NOBREAK:
                         setNoBreak(false);
                         break;
                   }
             }
+
       if (!_el.remove(el)) {
             qDebug("MeasureBase(%p)::remove(%s,%p) not found", this, el->name(), el);
             }
+
+      triggerLayout();
+      if (next())
+            next()->triggerLayout();
       }
 
 //---------------------------------------------------------
@@ -423,7 +425,7 @@ bool MeasureBase::setProperty(Pid id, const QVariant& value)
                         return false;
                   break;
             }
-      triggerLayoutAll();
+      triggerLayout();
       score()->setPlaylistDirty();
       return true;
       }

diff --git a/libmscore/slurtie.cpp b/libmscore/slurtie.cpp
@@ -255,7 +255,7 @@ bool SlurTieSegment::setProperty(Pid propertyId, const QVariant& v)
             default:
                   return SpannerSegment::setProperty(propertyId, v);
             }
-      triggerLayoutAll();
+      triggerLayout();
       return true;
       }
 
@@ -526,7 +526,7 @@ bool SlurTie::setProperty(Pid propertyId, const QVariant& v)
             default:
                   return Spanner::setProperty(propertyId, v);
             }
-      triggerLayoutAll();
+      triggerLayout();
       return true;
       }
 

diff --git a/libmscore/spanner.cpp b/libmscore/spanner.cpp
@@ -159,7 +159,7 @@ bool SpannerSegment::setProperty(Pid pid, const QVariant& v)
       switch (pid) {
             case Pid::OFFSET2:
                   _offset2 = v.toPointF();
-                  triggerLayoutAll();
+                  triggerLayout();
                   break;
             default:
                   return Element::setProperty(pid, v);
@@ -1119,16 +1119,6 @@ void Spanner::triggerLayout() const
       score()->setLayout(_tick, _tick + _ticks, staffIdx(), track2staff(tr2), this);
       }
 
-void Spanner::triggerLayoutAll() const
-      {
-      // Spanners do not have parent even when added to a score, so can't check parent here
-      score()->setLayoutAll(staffIdx(), this);
-
-      const int tr2 = track2();
-      if (tr2 != -1 && tr2 != track())
-            score()->setLayoutAll(track2staff(tr2), this);
-      }
-
 //---------------------------------------------------------
 //   pushUnusedSegment
 //---------------------------------------------------------

diff --git a/libmscore/spanner.h b/libmscore/spanner.h
@@ -206,7 +206,6 @@ class Spanner : public Element {
       virtual void layoutSystemsDone();
 
       virtual void triggerLayout() const override;
-      virtual void triggerLayoutAll() const override;
       virtual void add(Element*) override;
       virtual void remove(Element*) override;
       virtual void scanElements(void* data, void (*func)(void*, Element*), bool all=true) override;

diff --git a/libmscore/tie.cpp b/libmscore/tie.cpp
@@ -130,7 +130,7 @@ void TieSegment::changeAnchor(EditData& ed, Element* element)
             score()->endCmd();
             score()->startCmd();
             ed.view->startEdit(newSegment, ed.curGrip);
-            triggerLayoutAll();
+            triggerLayout();
             }
       }
 

diff --git a/libmscore/trill.cpp b/libmscore/trill.cpp
@@ -489,7 +489,7 @@ bool Trill::setProperty(Pid propertyId, const QVariant& val)
                         return false;
                   break;
             }
-      triggerLayoutAll();
+      triggerLayout();
       return true;
       }
 

diff --git a/libmscore/vibrato.cpp b/libmscore/vibrato.cpp
@@ -343,7 +343,7 @@ bool Vibrato::setProperty(Pid propertyId, const QVariant& val)
                         return false;
                   break;
             }
-      triggerLayoutAll();
+      triggerLayout();
       return true;
       }