diff --git a/common.pri b/common.pri index d49ac3e..8c0a66c 100644 --- a/common.pri +++ b/common.pri @@ -97,7 +97,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MINOR = 4 -LIMEREPORT_VERSION_RELEASE = 75 +LIMEREPORT_VERSION_RELEASE = 76 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" diff --git a/limereport/lrbanddesignintf.cpp b/limereport/lrbanddesignintf.cpp index 1d790cc..c843fac 100644 --- a/limereport/lrbanddesignintf.cpp +++ b/limereport/lrbanddesignintf.cpp @@ -614,7 +614,7 @@ BaseDesignIntf *BandDesignIntf::cloneBottomPart(int height, QObject *owner, QGra BaseDesignIntf* tmpItem = item->cloneItem(item->itemMode(),bottomPart,bottomPart); tmpItem->setPos(tmpItem->pos().x(), (tmpItem->pos().y()-height)+borderLineSize()); } - else if ((item->geometry().top()geometry().bottom()>height)){ + else if ((item->geometry().top()<=height) && (item->geometry().bottom()>height)){ int sliceHeight = height-item->geometry().top(); if (item->isSplittable() && item->canBeSplitted(sliceHeight)) { BaseDesignIntf* tmpItem=item->cloneBottomPart(sliceHeight,bottomPart,bottomPart); @@ -626,7 +626,7 @@ BaseDesignIntf *BandDesignIntf::cloneBottomPart(int height, QObject *owner, QGra moveItemsDown(item->pos().y()+item->height(), sizeOffset + bottomOffset); } } else { - if ((item->geometry().bottom()-height)>height){ + if ((item->geometry().bottom()-height)>=height){ BaseDesignIntf* tmpItem = item->cloneItem(item->itemMode(),bottomPart,bottomPart); tmpItem->setPos(tmpItem->pos().x(),borderLineSize()); tmpItem->setHeight((this->height()-height));