Merge pull request #32652 from pedroataidefonseca/fix/issue#32538

Fix #32538: Keep down spacer from forcing system to page bottom

Author: mike-spa

src/engraving/dom/spacer.cpp

@@ -27,6 +27,7 @@
 
 #include "measure.h"
 #include "score.h"
+#include "system.h"
 
 using namespace mu;
 using namespace muse::draw;
@@ -161,6 +162,62 @@ PropertyValue Spacer::propertyDefault(Pid id) const
     }
 }
 
+//---------------------------------------------------------
+//   triggerLayout
+//---------------------------------------------------------
+
+void Spacer::triggerLayout() const
+{
+    if (!explicitParent()) {
+        return;
+    }
+
+    Measure* m = measure();
+    if (!m) {
+        EngravingItem::triggerLayout();
+        return;
+    }
+
+    Score* s = score();
+    System* system = m->system();
+    if (!s || !system || s->nstaves() == 0) {
+        m->triggerLayout();
+        return;
+    }
+
+    // Most spacer edits can stay local to the measure and are much cheaper.
+    // Escalate only for down/fixed spacers on the last non-vbox system of the page,
+    // where edits can repaginate and affect page-end spacing.
+    if (spacerType() == SpacerType::UP) {
+        m->triggerLayout();
+        return;
+    }
+
+    System* nextSystem = m->nextNonVBoxSystem();
+    if (nextSystem && nextSystem->page() == system->page()) {
+        m->triggerLayout();
+        return;
+    }
+
+    // For the last notation system on a page, include the next system boundary
+    // so page-end spacing can be recomputed without relaying out the whole score.
+    Measure* firstMeasure = system->firstMeasure();
+    if (!firstMeasure) {
+        m->triggerLayout();
+        return;
+    }
+
+    Fraction startTick = firstMeasure->tick();
+    Fraction endTick = s->endTick();
+    if (nextSystem) {
+        if (Measure* nextFirstMeasure = nextSystem->firstMeasure()) {
+            endTick = nextFirstMeasure->tick();
+        }
+    }
+
+    s->setLayout(startTick, endTick, 0, s->nstaves() - 1, this);
+}
+
 //---------------------------------------------------------
 //   subtypeUserName
 //---------------------------------------------------------

src/engraving/dom/spacer.h

@@ -75,6 +75,7 @@ class Spacer final : public EngravingItem
     PropertyValue getProperty(Pid propertyId) const override;
     bool setProperty(Pid propertyId, const PropertyValue&) override;
     PropertyValue propertyDefault(Pid id) const override;
+    void triggerLayout() const override;
 
     struct LayoutData : public EngravingItem::LayoutData {
         PainterPath path;

src/engraving/rendering/score/pagelayout.cpp

@@ -251,7 +251,9 @@ void PageLayout::collectPage(LayoutContext& ctx)
                     dist += footerExtension;
                 }
             } else if (!ctx.state().prevSystem()->hasFixedDownDistance()) {
-                double margin = std::max(ctx.state().curSystem()->minBottom(), ctx.state().curSystem()->spacerDistance(false));
+                // Down spacers define distance to the following system, not to the page footer.
+                // Using them here can visually pin/stretch the current system to page edge.
+                double margin = ctx.state().curSystem()->minBottom();
                 // ensure it doesn't collide with footer
                 if (footerExtension > 0) {
                     margin += footerExtension + headerFooterPadding;
@@ -261,7 +263,10 @@ void PageLayout::collectPage(LayoutContext& ctx)
             isPageBreak = (y + dist) >= endY && breakPages;
         }
         if (isPageBreak) {
-            double dist = std::max(ctx.state().prevSystem()->minBottom(), ctx.state().prevSystem()->spacerDistance(false));
+            double dist = ctx.state().prevSystem()->minBottom();
+            if (!ctx.conf().isVerticalSpreadEnabled()) {
+                dist = std::max(dist, ctx.state().prevSystem()->spacerDistance(false));
+            }
             double footerPadding = 0.0;
             // ensure it doesn't collide with footer
             if (footerExtension > 0) {

src/engraving/rendering/score/systemlayout.cpp

@@ -2385,6 +2385,11 @@ void SystemLayout::restoreLayout2(System* system, LayoutContext& ctx)
 
     system->setHeight(system->systemHeight());
     SystemLayout::setMeasureHeight(system, system->systemHeight(), ctx);
+
+    // Reused systems can move across pages during partial relayout.
+    // Refresh geometry derived from SysStaff vertical positions.
+    SystemLayout::layoutBracketsVertical(system, ctx);
+    SystemHeaderLayout::setInstrumentNamesVerticalPos(system, ctx);
 }
 
 void SystemLayout::setMeasureHeight(System* system, double height, const LayoutContext& ctx)