mirror of
https://github.com/fralx/LimeReport.git
synced 2024-12-25 00:54:39 +03:00
Finish 1.4.61
This commit is contained in:
commit
ac31a60c75
@ -607,14 +607,13 @@ BaseDesignIntf *BandDesignIntf::cloneBottomPart(int height, QObject *owner, QGra
|
|||||||
if (item){
|
if (item){
|
||||||
if (item->geometry().top()>height){
|
if (item->geometry().top()>height){
|
||||||
BaseDesignIntf* tmpItem = item->cloneItem(item->itemMode(),bottomPart,bottomPart);
|
BaseDesignIntf* tmpItem = item->cloneItem(item->itemMode(),bottomPart,bottomPart);
|
||||||
tmpItem->setPos(tmpItem->pos().x(),tmpItem->pos().y()-height);
|
tmpItem->setPos(tmpItem->pos().x(), (tmpItem->pos().y()-height)+borderLineSize());
|
||||||
}
|
}
|
||||||
else if ((item->geometry().top()<height) && (item->geometry().bottom()>height)){
|
else if ((item->geometry().top()<height) && (item->geometry().bottom()>height)){
|
||||||
int sliceHeight = height-item->geometry().top();
|
int sliceHeight = height-item->geometry().top();
|
||||||
if (item->isSplittable() && item->canBeSplitted(sliceHeight)) {
|
if (item->isSplittable() && item->canBeSplitted(sliceHeight)) {
|
||||||
BaseDesignIntf* tmpItem=item->cloneBottomPart(sliceHeight,bottomPart,bottomPart);
|
BaseDesignIntf* tmpItem=item->cloneBottomPart(sliceHeight,bottomPart,bottomPart);
|
||||||
tmpItem->setPos(tmpItem->pos().x(),0);
|
tmpItem->setPos(tmpItem->pos().x(),borderLineSize());
|
||||||
if (tmpItem->pos().y()<0) tmpItem->setPos(tmpItem->pos().x(),0);
|
|
||||||
BaseDesignIntf* slicedItem = m_slicedItems.value(tmpItem->objectName());
|
BaseDesignIntf* slicedItem = m_slicedItems.value(tmpItem->objectName());
|
||||||
if (slicedItem){
|
if (slicedItem){
|
||||||
qreal sizeOffset = (slicedItem->height()+tmpItem->height()) - item->height();
|
qreal sizeOffset = (slicedItem->height()+tmpItem->height()) - item->height();
|
||||||
@ -624,12 +623,12 @@ BaseDesignIntf *BandDesignIntf::cloneBottomPart(int height, QObject *owner, QGra
|
|||||||
} else {
|
} else {
|
||||||
if ((item->geometry().bottom()-height)>height){
|
if ((item->geometry().bottom()-height)>height){
|
||||||
BaseDesignIntf* tmpItem = item->cloneItem(item->itemMode(),bottomPart,bottomPart);
|
BaseDesignIntf* tmpItem = item->cloneItem(item->itemMode(),bottomPart,bottomPart);
|
||||||
tmpItem->setPos(tmpItem->pos().x(),0);
|
tmpItem->setPos(tmpItem->pos().x(),borderLineSize());
|
||||||
tmpItem->setHeight((this->height()-height));
|
tmpItem->setHeight((this->height()-height));
|
||||||
} else {
|
} else {
|
||||||
BaseDesignIntf* tmpItem = item->cloneEmpty((this->height()-height),bottomPart,bottomPart);
|
BaseDesignIntf* tmpItem = item->cloneEmpty((this->height()-height),bottomPart,bottomPart);
|
||||||
if (tmpItem)
|
if (tmpItem)
|
||||||
tmpItem->setPos(tmpItem->pos().x(),0);
|
tmpItem->setPos(tmpItem->pos().x(),borderLineSize());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user