midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-3518 Improvement For Mobile Compatibility

This commit is contained in:
Murilo Habermann Torquato 2018-01-05 15:38:49 +01:00
parent 23d2ca465e
commit 80acb075a8
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
View File

@ -484,9 +484,13 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
decimalFormat.setRoundingMode(RoundingMode.DOWN); decimalFormat.setRoundingMode(RoundingMode.DOWN);
String columnWidth = decimalFormat.format(equalWidth); String columnWidth = decimalFormat.format(equalWidth);
for (int h=0;h<numCols;h++){ for (int h=0;h<numCols+1;h++){
Column col = new Column(); Column col = new Column();
ZKUpdateUtil.setWidth(col, columnWidth + "%"); if (h == numCols) {
ZKUpdateUtil.setWidth(col, "5%");
} else {
ZKUpdateUtil.setWidth(col, columnWidth + "%");
}
columns.appendChild(col); columns.appendChild(col);
} }
@ -587,8 +591,10 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
actualxpos = 0; actualxpos = 0;
} }
// get the column span for field
int columnSpan = field.getColumnSpan();
int xpos = field.getXPosition(); int xpos = field.getXPosition();
if (xpos > numCols && diff > 0) if (xpos + columnSpan > numCols && diff > 0)
{ {
xpos = xpos - diff; xpos = xpos - diff;
if (xpos <= 0) if (xpos <= 0)
@ -613,10 +619,16 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
if (xpos-1 - actualxpos > 0) if (xpos-1 - actualxpos > 0)
row.appendCellChild(createSpacer(), xpos-1 - actualxpos); row.appendCellChild(createSpacer(), xpos-1 - actualxpos);
boolean paintLabel = ! (field.getDisplayType() == DisplayType.Button || field.getDisplayType() == DisplayType.YesNo || field.isFieldOnly()); boolean paintLabel = ! (field.getDisplayType() == DisplayType.Button || field.getDisplayType() == DisplayType.YesNo || field.isFieldOnly());
// Adjust column spam to the remain columns size
int remainCols = numCols - actualxpos;
if (columnSpan > remainCols)
columnSpan = remainCols-1 > 0 ? remainCols-1 : 1;
if (field.isHeading()) if (field.isHeading())
actualxpos = xpos; actualxpos = xpos;
else else
actualxpos = xpos + field.getColumnSpan()-1 + (paintLabel ? 1 : 0); actualxpos = xpos + columnSpan-1 + (paintLabel ? 1 : 0);
if (! field.isHeading()) { if (! field.isHeading()) {
@ -645,7 +657,8 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
div.appendChild(label.getDecorator()); div.appendChild(label.getDecorator());
row.appendCellChild(div,1); row.appendCellChild(div,1);
} }
row.appendCellChild(editor.getComponent(), field.getColumnSpan());
row.appendCellChild(editor.getComponent(), columnSpan );
//to support float/absolute editor //to support float/absolute editor
row.getLastCell().setStyle("position: relative; overflow: visible;"); row.getLastCell().setStyle("position: relative; overflow: visible;");