python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2024-12-23 20:22:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix: replace fakeMarginSize() -> marginSize()

Browse Source 
* В алгоритмах расчета размеров объекта использовалась функция
fakeMarginSize() увеличивающая отступы на 5px.
This commit is contained in:
Dmitry Zagorodnev 2023-03-15 09:35:59 +03:00
parent fbfe26aa53
commit 87eae706e5
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
limereport/items/lrtextitem.cpp
View File

@ -77,10 +77,6 @@ TextItem::TextItem(QObject *owner, QGraphicsItem *parent)
TextItem::~TextItem(){} TextItem::~TextItem(){}
int TextItem::fakeMarginSize() const{
return marginSize()/*+5*/;
}
void TextItem::preparePopUpMenu(QMenu &menu) void TextItem::preparePopUpMenu(QMenu &menu)
{ {
QAction* editAction = menu.addAction(QIcon(":/report/images/edit_pecil2.png"),tr("Edit")); QAction* editAction = menu.addAction(QIcon(":/report/images/edit_pecil2.png"),tr("Edit"));
@ -180,7 +176,7 @@ void TextItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* style, Q
qreal hOffset = 0, vOffset = 0; qreal hOffset = 0, vOffset = 0;
switch (m_angle){ switch (m_angle){
case Angle0: case Angle0:
hOffset = fakeMarginSize(); hOffset = marginSize();
if ((tmpSize.height() > 0) && (m_alignment & Qt::AlignVCenter)){ if ((tmpSize.height() > 0) && (m_alignment & Qt::AlignVCenter)){
vOffset = tmpSize.height() / 2; vOffset = tmpSize.height() / 2;
} }
@ -189,8 +185,8 @@ void TextItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* style, Q
painter->translate(hOffset,vOffset); painter->translate(hOffset,vOffset);
break; break;
case Angle90: case Angle90:
hOffset = width() - fakeMarginSize(); hOffset = width() - marginSize();
vOffset = fakeMarginSize(); vOffset = marginSize();
if (m_alignment & Qt::AlignVCenter){ if (m_alignment & Qt::AlignVCenter){
hOffset = (width() - text->size().height()) / 2 + text->size().height(); hOffset = (width() - text->size().height()) / 2 + text->size().height();
} }
@ -202,8 +198,8 @@ void TextItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* style, Q
painter->rotate(90); painter->rotate(90);
break; break;
case Angle180: case Angle180:
hOffset = width() - fakeMarginSize(); hOffset = width() - marginSize();
vOffset = height() - fakeMarginSize(); vOffset = height() - marginSize();
if ((tmpSize.width()>0) && (m_alignment & Qt::AlignVCenter)){ if ((tmpSize.width()>0) && (m_alignment & Qt::AlignVCenter)){
vOffset = tmpSize.height() / 2+ text->size().height(); vOffset = tmpSize.height() / 2+ text->size().height();
} }
@ -214,8 +210,8 @@ void TextItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* style, Q
painter->rotate(180); painter->rotate(180);
break; break;
case Angle270: case Angle270:
hOffset = fakeMarginSize(); hOffset = marginSize();
vOffset = height()-fakeMarginSize(); vOffset = height()-marginSize();
if (m_alignment & Qt::AlignVCenter){ if (m_alignment & Qt::AlignVCenter){
hOffset = (width() - text->size().height())/2; hOffset = (width() - text->size().height())/2;
} }
@ -321,7 +317,7 @@ void TextItem::updateItemSize(DataSourceManager* dataManager, RenderPass pass, i
initTextSizes(); initTextSizes();
if (m_textSize.width()>width() && ((m_autoWidth==MaxWordLength)||(m_autoWidth==MaxStringLength))){ if (m_textSize.width()>width() && ((m_autoWidth==MaxWordLength)||(m_autoWidth==MaxStringLength))){
setWidth(m_textSize.width() + fakeMarginSize()*2); setWidth(m_textSize.width() + marginSize()*2);
} }
if (m_textSize.height()>height()) { if (m_textSize.height()>height()) {
@ -380,9 +376,9 @@ QString TextItem::replaceReturns(QString text) const
void TextItem::setTextFont(TextPtr text, const QFont& value) const { void TextItem::setTextFont(TextPtr text, const QFont& value) const {
text->setDefaultFont(value); text->setDefaultFont(value);
if ((m_angle==Angle0)||(m_angle==Angle180)){ if ((m_angle==Angle0)||(m_angle==Angle180)){
text->setTextWidth(rect().width()-fakeMarginSize()*2); text->setTextWidth(rect().width()-marginSize()*2);
} else { } else {
text->setTextWidth(rect().height()-fakeMarginSize()*2); text->setTextWidth(rect().height()-marginSize()*2);
} }
} }
@ -394,7 +390,7 @@ void TextItem::adaptFontSize(TextPtr text) const{
if (_font.pixelSize()>2) if (_font.pixelSize()>2)
_font.setPixelSize(_font.pixelSize()-1); _font.setPixelSize(_font.pixelSize()-1);
else break; else break;
} while(text->size().height()>this->height() || text->size().width()>(this->width()) - fakeMarginSize() * 2); } while(text->size().height()>this->height() || text->size().width()>(this->width()) - marginSize() * 2);
} }
int TextItem::underlineLineSize() const int TextItem::underlineLineSize() const

1
limereport/items/lrtextitem.h
View File

@ -192,7 +192,6 @@ protected:
bool isNeedExpandContent() const; bool isNeedExpandContent() const;
QString replaceBR(QString text) const; QString replaceBR(QString text) const;
QString replaceReturns(QString text) const; QString replaceReturns(QString text) const;
int fakeMarginSize() const;
QString getTextPart(int height, int skipHeight); QString getTextPart(int height, int skipHeight);
void restoreLinksEvent(); void restoreLinksEvent();
void preparePopUpMenu(QMenu &menu); void preparePopUpMenu(QMenu &menu);