kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[TD]fix BRect on empty text items

Browse Source
This commit is contained in:
wandererfan
2019-08-13 15:55:57 -04:00
committed by WandererFan
parent 178520fb4a
commit 3c4700d05b
4 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Mod/TechDraw/Gui/QGITile.cpp
View File

@@ -23,6 +23,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
#include <QPainter>
#include <QGraphicsItem>
#include <QStyleOptionGraphicsItem>
#include <QFile>
#include <QFileInfo>
@@ -48,9 +49,9 @@
using namespace TechDrawGui;
QGITile::QGITile() :
m_textL(QString()),
m_textR(QString()),
m_textC(QString()),
m_textL(QString::fromUtf8(" ")),
m_textR(QString::fromUtf8(" ")),
m_textC(QString::fromUtf8(" ")),
m_scale(1.0),
m_row(0),
m_col(0),
@@ -109,6 +110,7 @@ QVariant QGITile::itemChange(GraphicsItemChange change, const QVariant &value)
void QGITile::draw(void)
{
// Base::Console().Message("QGIT::draw()\n");
prepareGeometryChange();
m_wide = getSymbolWidth();
m_high = getSymbolHeight() * scaleToFont();
@@ -192,7 +194,10 @@ void QGITile::makeText(void)
m_qgTextL->setColor(m_colCurrent);
double textWidth = m_qgTextL->boundingRect().width();
double charWidth = textWidth / m_textL.size(); //not good for non-ASCII chars
double hMargin = (m_wide / 2.0) + (charWidth / 2.0);
double hMargin = 1;
if (!m_textL.isEmpty()) {
hMargin = (m_wide / 2.0) + (charWidth / 2.0);
}
double textHeightL = m_qgTextL->boundingRect().height();
double vOffset = 0.0;
@@ -208,7 +213,10 @@ void QGITile::makeText(void)
m_qgTextR->setColor(m_colCurrent);
textWidth = m_qgTextR->boundingRect().width();
charWidth = textWidth / m_textR.size();
hMargin = (m_wide / 2.0) + (charWidth / 2.0);
hMargin = 1;
if (!m_textR.isEmpty()) {
hMargin = (m_wide / 2.0) + (charWidth / 2.0);
}
double textHeightR = m_qgTextR->boundingRect().height();
if (m_row < 0) { // below line
vOffset = textHeightR * verticalFudge;