From 1684d2cfe643ae8bf64368218ee74c6f3927a097 Mon Sep 17 00:00:00 2001 From: zi-mozhuang <2802443161@qq.com> Date: Wed, 12 Aug 2026 15:13:52 +0800 Subject: [PATCH] syn --- sources/bordertitleblock.h | 5 ++--- sources/print/projectprintwindow.cpp | 11 +++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/sources/bordertitleblock.h b/sources/bordertitleblock.h index 4a1b60a09..bc57748e2 100644 --- a/sources/bordertitleblock.h +++ b/sources/bordertitleblock.h @@ -73,6 +73,8 @@ class BorderTitleBlock : public QObject return(rows_count_ * rows_height_); } /// @return la rows header width, in pixels qreal rowsHeaderWidth() const { return(rows_header_width_); } + // @return the edge where title block is docked + Qt::Edge titleBlockEdge() const { return(m_edge); } // border - title block = diagram /** @@ -94,9 +96,6 @@ class BorderTitleBlock : public QObject QRectF titleBlockRect () const; - // @return the edge where title block is docked - Qt::Edge titleBlockEdge() const { return(m_edge); } - DiagramContext titleblockInformation() const; private: QRectF titleBlockRectForQPainter () const; diff --git a/sources/print/projectprintwindow.cpp b/sources/print/projectprintwindow.cpp index 5d369b485..9282b8afa 100644 --- a/sources/print/projectprintwindow.cpp +++ b/sources/print/projectprintwindow.cpp @@ -450,14 +450,13 @@ QRect ProjectPrintWindow::diagramRect(Diagram *diagram, const ExportProperties & { auto diagram_rect = diagram->border_and_titleblock.borderAndTitleBlockRect(); if (!option.draw_titleblock) { - auto tbt_rect = diagram->border_and_titleblock.titleBlockRect(); - if (diagram->border_and_titleblock.titleBlockEdge() == Qt::BottomEdge) - diagram_rect.setHeight(diagram_rect.height() - tbt_rect.height()); - else - diagram_rect.setWidth(diagram_rect.width() - tbt_rect.width()); + auto tbt_rect = diagram->border_and_titleblock.titleBlockRect(); + if (diagram->border_and_titleblock.titleBlockEdge() == Qt::BottomEdge) + diagram_rect.setHeight(diagram_rect.height() - tbt_rect.height()); + else + diagram_rect.setWidth(diagram_rect.width() - tbt_rect.width()); } - //Adjust the border of diagram to 1px (width of the line) diagram_rect.adjust(0,0,1,1);