Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions CodenameOne/src/com/codename1/ui/table/TableLayout.java
Original file line number Diff line number Diff line change
Expand Up @@ -573,11 +573,12 @@ private void placeComponent(boolean rtl, Constraint con, int x, int y, int width
con.parent.setY(y + d);
con.parent.setHeight(height - d);
break;
default:
// Component.CENTER:
case Component.CENTER:
con.parent.setY(y + d / 2);
con.parent.setHeight(height - d);
break;
default:
break;
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@

import com.codename1.junit.FormTest;
import com.codename1.junit.UITestBase;
import com.codename1.ui.CN;
import com.codename1.ui.Component;
import com.codename1.ui.Form;
import com.codename1.ui.Label;
import com.codename1.ui.TextArea;

import java.util.Comparator;
import java.util.Date;
import java.lang.reflect.Method;

import static org.junit.jupiter.api.Assertions.*;
Expand Down Expand Up @@ -89,4 +91,29 @@ private Component findHeaderButton(Table table) {
// Row 0 is header if includeHeader is true (default).
return tl.getComponentAt(0, 0);
}

/**
* Test for a size regression bug in table layout discussed here: https://www.reddit.com/r/cn1/comments/1q6pmek/android_screen_out_of_ranges/
*/
@FormTest
void testTableLayoutDefaultSizing() {
Form f = CN.getCurrentForm();
TableLayout tl = new TableLayout(3, 2);
f.setLayout(tl);
f.setScrollable(false);
f.getContentPane().getAllStyles().setPadding(0, 0, 0, 0);
for(int iter = 0 ; iter < 6 ; iter++) {
Label l = new Label("T: " + iter);
l.getAllStyles().setMargin(0, 0, 0, 0);
f.addComponent(tl.createConstraint()
.hp(33)
.wp(50), l);
}
f.revalidate();

for(Component cmp : f.getContentPane()) {
assertTrue(cmp.getHeight() >= f.getContentPane().getHeight() / 100 * 32, "Height should be close to 33 percent");
assertTrue(cmp.getWidth() >= f.getContentPane().getWidth() / 2 - 1, "Width should be 50%");
}
}
}
Loading