From 514b41b1c21292aea37b0eda7ab5b0815272d663 Mon Sep 17 00:00:00 2001 From: Aapo Date: Thu, 3 Dec 2020 20:46:36 +0200 Subject: [PATCH] [TD] GQIViedDimension.cpp, GQCustomText.cpp - Fix Dimension label unit positioning bug and too tight bounding rectangle. --- src/Mod/TechDraw/Gui/QGCustomText.cpp | 4 ++-- src/Mod/TechDraw/Gui/QGIViewDimension.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Mod/TechDraw/Gui/QGCustomText.cpp b/src/Mod/TechDraw/Gui/QGCustomText.cpp index 42328402d4..8827134251 100644 --- a/src/Mod/TechDraw/Gui/QGCustomText.cpp +++ b/src/Mod/TechDraw/Gui/QGCustomText.cpp @@ -211,8 +211,8 @@ QRectF QGCustomText::tightBoundingRect() const qreal y_adj = (result.height() - tight.height())/4.0; // Adjust the bounding box 50% towards the Qt tightBoundingRect(), - // except chomp some extra empty space above the font (2*y_adj) - result.adjust(x_adj, 2*y_adj, -x_adj, -y_adj); + // except chomp some extra empty space above the font (1.75*y_adj) + result.adjust(x_adj, 1.75*y_adj, -x_adj, -y_adj); return result; } diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp index 75a2da471b..aba8dc5686 100644 --- a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp @@ -257,7 +257,8 @@ void QGIDatumLabel::setPosFromCenter(const double &xCenter, const double &yCente QRectF unitBox = m_unitText->boundingRect(); double unitWidth = unitBox.width(); double unitRight = right + unitWidth; - m_unitText->setPos(right,top); + // Set the m_unitText font *baseline* at same height as the m_dimText font baseline + m_unitText->setPos(right, 0.0); //set tolerance position QRectF overBox = m_tolTextOver->boundingRect();