0.2023.08.10: page_layout: fix bad page width for margin

Author: zvezdochiot

src/filters/page_layout/ImageView.cpp

@@ -691,7 +691,10 @@ ImageView::forceNonNegativeHardMargins(QRectF& middle_rect) const
 RelativeMargins
 ImageView::calcHardMargins() const
 {
-    qreal const scale = 1.0 / m_innerRect.width();
+    qreal pagewidth = m_innerRect.width();
+    qreal pagewidthheight = m_innerRect.height() * 0.7071067811865475244;
+    pagewidth = (pagewidth <  pagewidthheight) ?  pagewidthheight :  pagewidth; 
+    qreal const scale = 1.0 / pagewidth;
     return RelativeMargins(
                (m_innerRect.left() - m_middleRect.left()) * scale,
                (m_innerRect.top() - m_middleRect.top()) * scale,

src/filters/page_layout/PageLayout.cpp

@@ -50,10 +50,13 @@ PageLayout::PageLayout(
         // aggregate_size = content_size * scale + margins * width * scale
         // Solving for scale:
         // scale = aggregate_size / (content_size + margins * width)
+        qreal pagewidth = m_innerRect.width();
+        qreal pagewidthheight = m_innerRect.height() * 0.7071067811865475244;
+        pagewidth = (pagewidth <  pagewidthheight) ?  pagewidthheight :  pagewidth; 
         qreal const x_scale = aggregate_hard_size.width() /
-                              (m_innerRect.width() + (margins.left() + margins.right()) * m_innerRect.width());
+                              (m_innerRect.width() + (margins.left() + margins.right()) * pagewidth);
         qreal const y_scale = aggregate_hard_size.height() /
-                              (m_innerRect.height() + (margins.top() + margins.bottom()) * m_innerRect.width());
+                              (m_innerRect.height() + (margins.top() + margins.bottom()) * pagewidth);
 
         if (x_scale > 1.0 && y_scale > 1.0)
         {
@@ -73,9 +76,12 @@ PageLayout::PageLayout(
                       );
     }
 
+    qreal pagewidth = m_innerRect.width();
+    qreal pagewidthheight = m_innerRect.height() * 0.7071067811865475244;
+    pagewidth = (pagewidth <  pagewidthheight) ?  pagewidthheight :  pagewidth; 
     if (have_content_box)
     {
-        m_middleRect = margins.extendContentRect(m_innerRect);
+        m_middleRect = margins.extendContentRect(m_innerRect, pagewidth);
     }
     else
     {

src/foundation/RelativeMargins.h

@@ -37,9 +37,8 @@ class FOUNDATION_EXPORT RelativeMargins
     RelativeMargins(double left, double top, double right, double bottom)
         : m_top(top), m_bottom(bottom), m_left(left), m_right(right) {}
 
-    QRectF extendContentRect(QRectF const& rect) const
+    QRectF extendContentRect(QRectF const& rect, double const scale) const
     {
-        double const scale = rect.width();
         return rect.adjusted(-m_left * scale, -m_top * scale, m_right * scale, m_bottom * scale);
     }
 

src/version.h

@@ -20,6 +20,6 @@
 #define SCANTAILOR_VERSION_H_
 
 #define VERSION "experimental"
-#define VERSION_QUAD "0.2023.08.09" // Must be "x.x.x.x" or an empty string.
+#define VERSION_QUAD "0.2023.08.10" // Must be "x.x.x.x" or an empty string.
 
 #endif