Merge pull request #3447 from Jojo-Schmitz/ninMaxSystemDistance-2.2

Fix #269238: make sure min and max system distance don't surpass one another
musescore · Feb 8, 2018 · 8c08e62 · 8c08e62
2 parents ee1a123 + 14e5917
commit 8c08e62
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/mscore/editstyle.cpp b/mscore/editstyle.cpp
@@ -281,6 +281,8 @@ EditStyle::EditStyle(Score* s, QWidget* parent)
       connect(swingEighth, SIGNAL(toggled(bool)), SLOT(setSwingParams(bool)));
       connect(swingSixteenth, SIGNAL(toggled(bool)), SLOT(setSwingParams(bool)));
       connect(hideEmptyStaves, SIGNAL(clicked(bool)), dontHideStavesInFirstSystem, SLOT(setEnabled(bool)));
+      connect(minSystemDistance,   SIGNAL(valueChanged(double)),      SLOT(systemMinDistanceValueChanged(double)));
+      connect(maxSystemDistance,   SIGNAL(valueChanged(double)),      SLOT(systemMaxDistanceValueChanged(double)));
 
       QSignalMapper* mapper = new QSignalMapper(this);
 
@@ -911,6 +913,27 @@ void EditStyle::toggleFooterOddEven(bool checked)
       return;
       }
 
+//---------------------------------------------------------
+//   systemMin/MaxDistanceValueChanged
+//
+//    Ensure minSystemDistance <= maxSystemDistance
+//---------------------------------------------------------
+
+void EditStyle::systemMaxDistanceValueChanged(double val)
+      {
+      double otherVal = minSystemDistance->value();
+      if (otherVal > val)
+            maxSystemDistance->setValue(otherVal);
+      }
+
+
+void EditStyle::systemMinDistanceValueChanged(double val)
+      {
+      double otherVal = maxSystemDistance->value();
+      if (otherVal < val)
+            minSystemDistance->setValue(otherVal);
+      }
+
 //---------------------------------------------------------
 //   setPage
 //---------------------------------------------------------

diff --git a/mscore/editstyle.h b/mscore/editstyle.h
@@ -70,6 +70,8 @@ class EditStyle : public QDialog, private Ui::EditStyleBase {
       void toggleFooterOddEven(bool);
       void buttonClicked(QAbstractButton*);
       void setSwingParams(bool);
+      void systemMinDistanceValueChanged(double);
+      void systemMaxDistanceValueChanged(double);
       void resetStyleValue(int i);
 
       void on_comboFBFont_currentIndexChanged(int index);