From 20247dd88f2821d2e1dab775784fcf294aa83308 Mon Sep 17 00:00:00 2001 From: wandererfan Date: Mon, 6 Aug 2018 11:57:20 -0400 Subject: [PATCH] Fix QGIVP boundingRect --- src/Mod/TechDraw/Gui/QGIView.cpp | 5 +++-- src/Mod/TechDraw/Gui/QGIView.h | 2 +- src/Mod/TechDraw/Gui/QGIViewPart.cpp | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Mod/TechDraw/Gui/QGIView.cpp b/src/Mod/TechDraw/Gui/QGIView.cpp index b79280a6c8..af747d747b 100644 --- a/src/Mod/TechDraw/Gui/QGIView.cpp +++ b/src/Mod/TechDraw/Gui/QGIView.cpp @@ -409,12 +409,13 @@ void QGIView::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, Q QStyleOptionGraphicsItem myOption(*option); myOption.state &= ~QStyle::State_Selected; - //painter->drawRect(boundingRect()); //good for debugging +// painter->drawRect(boundingRect()); //good for debugging QGraphicsItemGroup::paint(painter, &myOption, widget); } -QRectF QGIView::customChildrenBoundingRect() { +QRectF QGIView::customChildrenBoundingRect() const +{ QList children = childItems(); int dimItemType = QGraphicsItem::UserType + 106; // TODO: Magic number warning. int borderItemType = QGraphicsItem::UserType + 136; // TODO: Magic number warning diff --git a/src/Mod/TechDraw/Gui/QGIView.h b/src/Mod/TechDraw/Gui/QGIView.h index bc8521645f..07966744a9 100644 --- a/src/Mod/TechDraw/Gui/QGIView.h +++ b/src/Mod/TechDraw/Gui/QGIView.h @@ -109,7 +109,7 @@ protected: // Preselection events: virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; - virtual QRectF customChildrenBoundingRect(void); + virtual QRectF customChildrenBoundingRect(void) const; void dumpRect(char* text, QRectF r); QString getPrefFont(void); diff --git a/src/Mod/TechDraw/Gui/QGIViewPart.cpp b/src/Mod/TechDraw/Gui/QGIViewPart.cpp index fab5effadd..ea2daa4eaa 100644 --- a/src/Mod/TechDraw/Gui/QGIViewPart.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewPart.cpp @@ -984,7 +984,9 @@ void QGIViewPart::dumpPath(const char* text,QPainterPath path) QRectF QGIViewPart::boundingRect() const { - return childrenBoundingRect(); +// return childrenBoundingRect(); +// return customChildrenBoundingRect(); + return QGIView::boundingRect(); } //QGIViewPart derived classes do not need a rotate view method as rotation is handled on App side.