honor maxSystemDistance

musescore · Aug 11, 2017 · a66d69a · a66d69a
1 parent ae60d40
commit a66d69a
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 5 deletions.
diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -1470,6 +1470,8 @@ static void layoutPage(Page* page, qreal restHeight)
 
       std::sort(sList.begin(), sList.end(), [](System* a, System* b) { return a->distance() < b->distance(); });
 
+      qreal maxDist = score->styleP(StyleIdx::maxSystemDistance);
+
       qreal dist = sList[0]->distance();
       for (int i = 1; i < sList.size(); ++i) {
             qreal ndist = sList[i]->distance();
@@ -1483,7 +1485,10 @@ static void layoutPage(Page* page, qreal restHeight)
                         }
                   for (int k = 0; k < i; ++k) {
                         System* s = sList[k];
-                        s->setDistance(s->distance() + fill);
+                        qreal d = s->distance() + fill;
+                        if ((d - s->height()) > maxDist)
+                              d = qMax(maxDist + s->height(), s->distance());
+                        s->setDistance(d);
                         }
                   restHeight -= totalFill;
                   if (restHeight <= 0)
@@ -1494,7 +1499,10 @@ static void layoutPage(Page* page, qreal restHeight)
             qreal fill = restHeight / sList.size();
             for (int i = 0; i < sList.size(); ++i) {
                   System* s = sList[i];
-                  s->setDistance(s->distance() + fill);
+                  qreal d = s->distance() + fill;
+                  if ((d - s->height()) > maxDist)
+                        d = qMax(maxDist + s->height(), s->distance());
+                  s->setDistance(d);
                   }
             }
 

diff --git a/mscore/editstyle.ui b/mscore/editstyle.ui
@@ -171,7 +171,7 @@
      </widget>
      <widget class="QStackedWidget" name="pageStack">
       <property name="currentIndex">
-       <number>28</number>
+       <number>1</number>
       </property>
       <widget class="QWidget" name="PageScore">
        <layout class="QVBoxLayout" name="verticalLayout_20">
@@ -636,6 +636,9 @@
              <property name="maximum">
               <double>1000.000000000000000</double>
              </property>
+             <property name="singleStep">
+              <double>0.500000000000000</double>
+             </property>
             </widget>
            </item>
            <item row="7" column="0" colspan="2">
@@ -687,6 +690,9 @@
              <property name="maximum">
               <double>1000.000000000000000</double>
              </property>
+             <property name="singleStep">
+              <double>0.500000000000000</double>
+             </property>
             </widget>
            </item>
            <item row="1" column="0">
@@ -767,7 +773,7 @@
               <double>1000.000000000000000</double>
              </property>
              <property name="singleStep">
-              <double>0.100000000000000</double>
+              <double>0.500000000000000</double>
              </property>
             </widget>
            </item>
@@ -807,6 +813,9 @@
              <property name="maximum">
               <double>1000.000000000000000</double>
              </property>
+             <property name="singleStep">
+              <double>0.500000000000000</double>
+             </property>
             </widget>
            </item>
            <item row="4" column="0">
@@ -845,6 +854,9 @@
              <property name="minimum">
               <double>-100.000000000000000</double>
              </property>
+             <property name="singleStep">
+              <double>0.500000000000000</double>
+             </property>
             </widget>
            </item>
            <item row="4" column="4">
@@ -883,6 +895,9 @@
              <property name="minimum">
               <double>-100.000000000000000</double>
              </property>
+             <property name="singleStep">
+              <double>0.500000000000000</double>
+             </property>
             </widget>
            </item>
            <item row="10" column="0">
@@ -939,11 +954,14 @@
               <number>1</number>
              </property>
              <property name="minimum">
-              <double>-1000.000000000000000</double>
+              <double>0.000000000000000</double>
              </property>
              <property name="maximum">
               <double>1000.000000000000000</double>
              </property>
+             <property name="singleStep">
+              <double>0.500000000000000</double>
+             </property>
             </widget>
            </item>
            <item row="2" column="4">