mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-01 03:29:49 +03:00
Code Activity

Layout spacing property has been added to layouts

Browse Source
This commit is contained in:
Arin Alexander
2019-02-05 23:25:18 +03:00
parent 65a3a36770
commit 867448d0fd
5 changed files with 44 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
limereport/items/lrhorizontallayout.cpp
View File

@@ -148,16 +148,18 @@ void HorizontalLayout::updateLayoutSize()
int spaceBorder = (borderLines() != 0) ? borderLineSize() : 0;
qreal w = spaceBorder*2;
qreal h = 0;
int visibleItemCount = 0;
foreach(BaseDesignIntf* item, layoutsChildren()){
if (item->isEmpty() && hideEmptyItems()) item->setVisible(false);
if (item->isVisible()){
if (h<item->height()) h=item->height();
w+=item->width();
visibleItemCount++;
}
}
if (h>0) setHeight(h+spaceBorder*2);
if (layoutType() == Layout)
setWidth(w);
setWidth(w + layoutSpacing() * (visibleItemCount-1));
else{
relocateChildren();
if (!isRelocating()){
@@ -181,7 +183,7 @@ void HorizontalLayout::relocateChildren()
foreach (BaseDesignIntf* item, layoutsChildren()) {
if (item->isVisible() || itemMode() == DesignMode){
item->setPos(curX,spaceBorder);
curX+=item->width();
curX += item->width() + layoutSpacing();
item->setHeight(height()-(spaceBorder * 2));
}
}
@@ -201,6 +203,8 @@ void HorizontalLayout::divideSpace(){
}
}
itemsSumSize += layoutSpacing() * (visibleItemsCount-1);
if (itemMode() == DesignMode && !layoutsChildren().isEmpty()){
qreal delta = (width() - (itemsSumSize+spaceBorder*2));
layoutsChildren().last()->setWidth(layoutsChildren().last()->width()+delta);