Fix calculation logic for multi-column overflow rects

plutoprint · Dec 12, 2024 · 80ccb1b · 80ccb1b
1 parent 84e5618
commit 80ccb1b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/source/layout/boxview.cpp b/source/layout/boxview.cpp
@@ -22,14 +22,14 @@ bool BoxView::isPrintMedia() const
 float BoxView::availableWidth() const
 {
     if(m_currentPage)
-        return m_currentPage->width();
+        return m_currentPage->width() - m_currentPage->marginWidth();
     return document()->viewportWidth();
 }
 
 std::optional<float> BoxView::availableHeight() const
 {
     if(m_currentPage)
-        return m_currentPage->height();
+        return m_currentPage->height() - m_currentPage->marginHeight();
     return document()->viewportHeight();
 }
 

diff --git a/source/layout/multicolumnbox.cpp b/source/layout/multicolumnbox.cpp
@@ -21,7 +21,9 @@ MultiColumnRowBox* MultiColumnRowBox::create(MultiColumnFlowBox* columnFlow, con
 void MultiColumnRowBox::updateOverflowRect()
 {
     BoxFrame::updateOverflowRect();
-    addOverflowRect(columnRectAt(numberOfColumns() - 1));
+    auto columnRect = columnRectAt(numberOfColumns() - 1);
+    auto overflowRect = m_columnFlowBox->visualOverflowRect().moved(columnRect.origin());
+    addOverflowRect(columnRect.y, columnRect.bottom(), overflowRect.x, overflowRect.right());
 }
 
 MultiColumnRowBox::MultiColumnRowBox(MultiColumnFlowBox* columnFlow, const RefPtr<BoxStyle>& style)