mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-25 17:14:40 +03:00
Code

Merge tag '1.5.27' into develop

Browse Source 
Finish 1.5.27
This commit is contained in:
Alexander Arin 2019-12-27 20:20:08 +03:00
commit 0f3966242d
5 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -128,7 +128,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 5 LIMEREPORT_VERSION_MINOR = 5
LIMEREPORT_VERSION_RELEASE = 26 LIMEREPORT_VERSION_RELEASE = 27
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}\\\"

7
limereport/lrbanddesignintf.cpp
View File

@ -241,6 +241,13 @@ void BandDesignIntf::setBackgroundOpacity(int value)
} }
} }
bool BandDesignIntf::isNeedUpdateSize(RenderPass pass) const{
foreach(BaseDesignIntf* item, childBaseItems()){
if (item->isNeedUpdateSize(pass)) return true;
}
return false;
}
void BandDesignIntf::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) void BandDesignIntf::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
{ {
prepareRect(painter, option, widget); prepareRect(painter, option, widget);

1
limereport/lrbanddesignintf.h
View File

@ -264,6 +264,7 @@ public:
void updateBandMarkerGeometry(); void updateBandMarkerGeometry();
int shiftItems() const; int shiftItems() const;
void setShiftItems(int shiftItems); void setShiftItems(int shiftItems);
bool isNeedUpdateSize(RenderPass) const;
signals: signals:
void bandRendered(BandDesignIntf* band); void bandRendered(BandDesignIntf* band);

2
limereport/lrbasedesignintf.cpp
View File

@ -1569,7 +1569,7 @@ void BaseDesignIntf::objectLoadFinished()
void BaseDesignIntf::parentObjectLoadFinished() void BaseDesignIntf::parentObjectLoadFinished()
{} {}
QList<BaseDesignIntf *> BaseDesignIntf::childBaseItems() QList<BaseDesignIntf *> BaseDesignIntf::childBaseItems() const
{ {
QList<BaseDesignIntf *> resList; QList<BaseDesignIntf *> resList;
foreach(QGraphicsItem * item, childItems()) { foreach(QGraphicsItem * item, childItems()) {

2
limereport/lrbasedesignintf.h
View File

@ -244,7 +244,7 @@ public:
virtual void parentObjectLoadFinished(); virtual void parentObjectLoadFinished();
virtual void beforeDelete(); virtual void beforeDelete();
QList<BaseDesignIntf*> childBaseItems(); QList<BaseDesignIntf*> childBaseItems() const;
QList<BaseDesignIntf*> allChildBaseItems(); QList<BaseDesignIntf*> allChildBaseItems();
BaseDesignIntf* childByName(const QString& name); BaseDesignIntf* childByName(const QString& name);