mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 16:44:39 +03:00
Code

Finish 1.4.136

Browse Source
This commit is contained in:
Arin Alexander 2019-06-21 22:14:13 +03:00
commit 7ba01c9d21
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -84,7 +84,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 4 LIMEREPORT_VERSION_MINOR = 4
LIMEREPORT_VERSION_RELEASE = 134 LIMEREPORT_VERSION_RELEASE = 136
LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"' LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"'
DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\" DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\"

6
limereport/lrpageitemdesignintf.cpp
View File

@ -400,7 +400,7 @@ void PageItemDesignIntf::relocateBands()
{ {
if (isLoading()) return; if (isLoading()) return;
int bandSpace = (itemMode() & DesignMode)?4:0; int bandSpace = (itemMode() & DesignMode) ? 0 : 0;
QVector<qreal> posByColumn; QVector<qreal> posByColumn;
@ -443,8 +443,8 @@ void PageItemDesignIntf::relocateBands()
m_bands[i+1]->setPos(pageRect().x(),posByColumn[0]); m_bands[i+1]->setPos(pageRect().x(),posByColumn[0]);
posByColumn[0] += m_bands[i+1]->height()+bandSpace; posByColumn[0] += m_bands[i+1]->height()+bandSpace;
} else { } else {
m_bands[i+1]->setPos(pageRect().x(),posByColumn[0]+2); m_bands[i+1]->setPos(pageRect().x(),posByColumn[0]);
posByColumn[0] += m_bands[i+1]->height()+bandSpace+2; posByColumn[0] += m_bands[i+1]->height()+bandSpace;
} }
} else { } else {
m_bands[i+1]->setPos(m_bands[i+1]->pos().x(),posByColumn[m_bands[i+1]->columnIndex()]); m_bands[i+1]->setPos(m_bands[i+1]->pos().x(),posByColumn[m_bands[i+1]->columnIndex()]);