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

Finish 1.4.91

Browse Source
This commit is contained in:
Arin Alexander 2018-07-16 16:17:38 +03:00
commit 5d4e1d7957
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -105,7 +105,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 4
LIMEREPORT_VERSION_RELEASE = 90
LIMEREPORT_VERSION_RELEASE = 91
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"

9
limereport/lrpageitemdesignintf.cpp
View File

@ -703,7 +703,8 @@ void PageItemDesignIntf::bandDeleted(QObject *band)
}
void PageItemDesignIntf::swapBands(BandDesignIntf* band, BandDesignIntf* bandToSwap){
int startIndex = std::min(band->minChildIndex(), bandToSwap->minChildIndex());
int firstStartIndex = std::min(band->minChildIndex(), bandToSwap->minChildIndex());
int secondStartIndex = std::max(band->minChildIndex(), bandToSwap->minChildIndex());
// int endIndex = std::max(band->maxChildIndex(), bandToSwap->maxChildIndex());
// QList<BandDesignIntf*> bandToMove;
@ -714,11 +715,11 @@ void PageItemDesignIntf::swapBands(BandDesignIntf* band, BandDesignIntf* bandToS
BandDesignIntf* firstMoveBand = (bandToSwap->bandIndex() > band->bandIndex()) ? bandToSwap: band;
firstMoveBand->changeBandIndex(startIndex, true);
firstMoveBand->changeBandIndex(firstStartIndex, true);
if (firstMoveBand == band){
bandToSwap->changeBandIndex(firstMoveBand->maxChildIndex()+1,true);
bandToSwap->changeBandIndex(secondStartIndex,true);
} else {
band->changeBandIndex(firstMoveBand->maxChildIndex()+1, true);
band->changeBandIndex(secondStartIndex, true);
}
relocateBands();

4
limereport/lrreportrender.cpp
View File

@ -1006,7 +1006,7 @@ bool ReportRender::registerBand(BandDesignIntf *band, bool registerInChildren)
m_maxHeightByColumn.append(m_maxHeightByColumn[0]);
m_currentStartDataPos.append(m_currentStartDataPos[0]);
}
m_currentColumn = 0;
m_currentColumn = -1;
}
@ -1014,7 +1014,7 @@ bool ReportRender::registerBand(BandDesignIntf *band, bool registerInChildren)
(!band->isHeader() || (band->bandNestingLevel() > 0 && band->columnsFillDirection() != BandDesignIntf::Horizontal ))){
if (band->columnsFillDirection() == BandDesignIntf::Horizontal){
if (m_currentColumn<band->columnsCount()-1)
if (m_currentColumn < band->columnsCount()-1)
m_currentColumn = m_currentColumn+1;
else
m_currentColumn = 0;