Fix QGIVP boundingRect

FreeCAD · Aug 11, 2018 · 603c294 · 603c294
1 parent 5730aae
commit 603c294
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git 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<QGraphicsItem*> 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
@@ -109,7 +109,7 @@ class TechDrawGuiExport  QGIView : public QGraphicsItemGroup
     // 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
@@ -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.