mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-04-03 16:03:46 +03:00
Code

Layout spacing has been fixed

Browse Source
This commit is contained in:
Arin Alexander 2019-02-10 04:50:40 +03:00
parent 931f093848
commit 8ba0449019
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
limereport/items/lrabstractlayout.cpp
View File

@ -225,12 +225,8 @@ void AbstractLayout::objectLoadFinished()
bool AbstractLayout::isNeedUpdateSize(RenderPass pass) const bool AbstractLayout::isNeedUpdateSize(RenderPass pass) const
{ {
foreach (QGraphicsItem *child, childItems()) { Q_UNUSED(pass)
BaseDesignIntf* item = dynamic_cast<BaseDesignIntf*>(child); return true;
if (item && (item->isNeedUpdateSize(pass) || item->isEmpty()))
return true;
}
return false;
} }
QVariant AbstractLayout::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant& value) QVariant AbstractLayout::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant& value)
@ -251,7 +247,8 @@ void AbstractLayout::updateItemSize(DataSourceManager* dataManager, RenderPass p
ItemDesignIntf::updateItemSize(dataManager, pass, maxHeight); ItemDesignIntf::updateItemSize(dataManager, pass, maxHeight);
foreach(QGraphicsItem *child, childItems()){ foreach(QGraphicsItem *child, childItems()){
BaseDesignIntf* item = dynamic_cast<BaseDesignIntf*>(child); BaseDesignIntf* item = dynamic_cast<BaseDesignIntf*>(child);
if (item) item->updateItemSize(dataManager, pass, maxHeight); if (item && item->isNeedUpdateSize(pass))
item->updateItemSize(dataManager, pass, maxHeight);
} }
updateLayoutSize(); updateLayoutSize();
relocateChildren(); relocateChildren();
@ -300,7 +297,7 @@ void AbstractLayout::slotOnChildDestroy(QObject* child)
void AbstractLayout::slotOnChildGeometryChanged(QObject* item, QRectF newGeometry, QRectF oldGeometry) void AbstractLayout::slotOnChildGeometryChanged(QObject* item, QRectF newGeometry, QRectF oldGeometry)
{ {
if (!m_isRelocating){ if (!m_isRelocating && !isLoading()){
if (m_layoutType == Layout){ if (m_layoutType == Layout){
relocateChildren(); relocateChildren();
updateLayoutSize(); updateLayoutSize();
@ -343,12 +340,15 @@ int AbstractLayout::layoutSpacing() const
void AbstractLayout::setLayoutSpacing(int layoutSpacing) void AbstractLayout::setLayoutSpacing(int layoutSpacing)
{ {
if (m_layoutSpacing != layoutSpacing){ if (m_layoutSpacing != layoutSpacing){
int oldValue = m_layoutSpacing; int oldValue = m_layoutSpacing;
m_layoutSpacing = layoutSpacing; m_layoutSpacing = layoutSpacing;
int delta = (m_layoutSpacing - oldValue) * (m_children.count()-1); if (!isLoading()){
notify("layoutSpacing", oldValue, m_layoutSpacing); int delta = (m_layoutSpacing - oldValue) * (m_children.count()-1);
setWidth(width() + delta); notify("layoutSpacing", oldValue, m_layoutSpacing);
setWidth(width() + delta);
}
relocateChildren();
} }
} }