0
0
mirror of https://github.com/fralx/LimeReport.git synced 2025-09-26 17:59:08 +03:00

Finish 1.4.124

# Conflicts:
#	limereport/lrbanddesignintf.h
#	limereport/lrpagedesignintf.cpp
#	limereport/lrpageitemdesignintf.h
#	translations/limereport_zh.ts
This commit is contained in:
Arin Alexander
2019-03-05 22:35:13 +03:00
7 changed files with 78 additions and 32 deletions

View File

@@ -2504,8 +2504,13 @@ CommandIf::Ptr BandMoveFromToCommand::create(PageDesignIntf* page, int from, int
bool BandMoveFromToCommand::doIt()
{
if (page() && page()->pageItem() && from != to) {
page()->pageItem()->moveBandFromTo(from, to);
return true;
BandDesignIntf* fromBand = page()->pageItem()->bandByIndex(from);
reverceTo = fromBand->minChildIndex();
if (fromBand){
page()->pageItem()->moveBandFromTo(from, to);
reverceFrom = fromBand->bandIndex();
return true;
}
}
return false;
}
@@ -2513,7 +2518,7 @@ bool BandMoveFromToCommand::doIt()
void BandMoveFromToCommand::undoIt()
{
if (page() && page()->pageItem())
page()->pageItem()->moveBandFromTo(to, from);
page()->pageItem()->moveBandFromTo(reverceFrom, reverceTo);
}
}