1.2024.10.03: page layout: fix update margins

Author: zvezdochiot

src/stages/page_layout/OptionsWidget.cpp

@@ -201,6 +201,7 @@ OptionsWidget::preUpdateUI(
         }
     }
 
+    updateFramingsDisplay();
     updateMarginsDisplay();
 
     {
@@ -269,7 +270,7 @@ OptionsWidget::extraWMarginChanged(double const val)
 
     m_framings.setFramingWidth(extraWMarginSpinBox->value() / 100.0);
 
-    updateMarginsDisplay();
+    updateFramingsDisplay();
     emit framingsChanged(m_framings);
     emit marginsSetLocally(m_margins);
     updateSizeDisplay();
@@ -287,7 +288,7 @@ OptionsWidget::extraHMarginChanged(double const val)
 
     m_framings.setFramingHeight(extraHMarginSpinBox->value() / 100.0);
 
-    updateMarginsDisplay();
+    updateFramingsDisplay();
     emit framingsChanged(m_framings);
     emit marginsSetLocally(m_margins);
     updateSizeDisplay();
@@ -329,7 +330,6 @@ OptionsWidget::vertMarginsChanged(double const val)
     m_margins.setTop(topMarginSpinBox->value() / 100.0);
     m_margins.setBottom(bottomMarginSpinBox->value() / 100.0);
 
-
     emit marginsSetLocally(m_margins);
     updateSizeDisplay();
 }
@@ -510,14 +510,25 @@ OptionsWidget::updateMarginsDisplay()
 {
     ScopedIncDec<int> const ignore_scope(m_ignoreMarginChanges);
 
-    extraWMarginSpinBox->setValue(m_framings.getFramingWidth() * 100.0);
-    extraHMarginSpinBox->setValue(m_framings.getFramingHeight() * 100.0);
     topMarginSpinBox->setValue(m_margins.top() * 100.0);
     bottomMarginSpinBox->setValue(m_margins.bottom() * 100.0);
     leftMarginSpinBox->setValue(m_margins.left() * 100.0);
     rightMarginSpinBox->setValue(m_margins.right() * 100.0);
 }
 
+void
+OptionsWidget::updateLinkDisplay(QToolButton* button, bool const linked)
+{
+    button->setIcon(linked ? m_chainIcon : m_brokenChainIcon);
+}
+
+void
+OptionsWidget::updateFramingsDisplay()
+{
+    extraWMarginSpinBox->setValue(m_framings.getFramingWidth() * 100.0);
+    extraHMarginSpinBox->setValue(m_framings.getFramingHeight() * 100.0);
+}
+
 void
 OptionsWidget::updateSizeDisplay()
 {
@@ -542,12 +553,6 @@ OptionsWidget::updateSizeDisplay()
     labelExtraHout->setText(tr(" = %1").arg(outheight));
 }
 
-void
-OptionsWidget::updateLinkDisplay(QToolButton* button, bool const linked)
-{
-    button->setIcon(linked ? m_chainIcon : m_brokenChainIcon);
-}
-
 void
 OptionsWidget::enableDisableAlignmentButtons()
 {

src/stages/page_layout/OptionsWidget.h

@@ -145,10 +145,12 @@ private slots:
 
     void updateMarginsDisplay();
 
-    void updateSizeDisplay();
-
     void updateLinkDisplay(QToolButton* button, bool linked);
 
+    void updateFramingsDisplay();
+
+    void updateSizeDisplay();
+
     void enableDisableAlignmentButtons();
 
     IntrusivePtr<Settings> m_ptrSettings;

src/version.h

@@ -20,6 +20,6 @@
 #define SCANTAILOR_VERSION_H_
 
 #define STFAMILY "experimental"
-#define VERSION "1.2024.09.29" // Must be "x.x.x.x" or an empty string.
+#define VERSION "1.2024.10.03" // Must be "x.x.x.x" or an empty string.
 
 #endif