javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11 from NativeScript/hhristov/grid-layout-fix

Browse Source 
Fixed grid layout alignments when width/height is specified.
This commit is contained in:
Hristo Hristov
2016-01-19 10:34:51 +02:00
parent 59f36fec8e 994339ee2b
commit 252777652e
2 changed files with 23 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "tns-core-modules-widgets", "name": "tns-core-modules-widgets",
"version": "1.6.0", "version": "1.6.1",
"description": "Native widgets used in the NativeScript framework.", "description": "Native widgets used in the NativeScript framework.",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {

60
widgets/src/main/java/org/nativescript/widgets/GridLayout.java
View File

@@ -249,16 +249,16 @@ public class GridLayout extends LayoutBase {
boolean infinityWidth = widthMode == MeasureSpec.UNSPECIFIED; boolean infinityWidth = widthMode == MeasureSpec.UNSPECIFIED;
boolean infinityHeight = heightMode == MeasureSpec.UNSPECIFIED; boolean infinityHeight = heightMode == MeasureSpec.UNSPECIFIED;
this.helper.width = width - horizontalPadding; this.helper.width = Math.max(0, width - horizontalPadding);
this.helper.height = height - verticalPadding; this.helper.height = Math.max(0, height - verticalPadding);
int gravity = LayoutBase.getGravity(this); int gravity = LayoutBase.getGravity(this);
int verticalGravity = gravity & Gravity.VERTICAL_GRAVITY_MASK; int verticalGravity = gravity & Gravity.VERTICAL_GRAVITY_MASK;
final int layoutDirection = this.getLayoutDirection(); final int layoutDirection = this.getLayoutDirection();
final int horizontalGravity = Gravity.getAbsoluteGravity(gravity, layoutDirection) & Gravity.HORIZONTAL_GRAVITY_MASK; final int horizontalGravity = Gravity.getAbsoluteGravity(gravity, layoutDirection) & Gravity.HORIZONTAL_GRAVITY_MASK;
this.helper.stretchedHorizontally = horizontalGravity == Gravity.FILL_HORIZONTAL && !infinityWidth; this.helper.stretchedHorizontally = widthMode == MeasureSpec.EXACTLY || (horizontalGravity == Gravity.FILL_HORIZONTAL && !infinityWidth);
this.helper.stretchedVertically = verticalGravity == Gravity.FILL_VERTICAL && !infinityHeight; this.helper.stretchedVertically = heightMode == MeasureSpec.EXACTLY || (verticalGravity == Gravity.FILL_VERTICAL && !infinityHeight);
this.helper.setInfinityWidth(infinityWidth); this.helper.setInfinityWidth(infinityWidth);
this.helper.setInfinityHeight(infinityHeight); this.helper.setInfinityHeight(infinityHeight);
@@ -527,8 +527,7 @@ class MeasureHelper {
if (this.infinityWidth != value) { if (this.infinityWidth != value) {
this.infinityWidth = value; this.infinityWidth = value;
int size = this.columns.size(); for(int i = 0, size = this.columns.size(); i < size; i++) {
for(int i = 0; i < size; i++) {
ItemGroup columnGroup = this.columns.get(i); ItemGroup columnGroup = this.columns.get(i);
columnGroup.setIsLengthInfinity(value); columnGroup.setIsLengthInfinity(value);
} }
@@ -538,9 +537,8 @@ class MeasureHelper {
public void setInfinityHeight(boolean value) { public void setInfinityHeight(boolean value) {
if (this.infinityHeight != value) { if (this.infinityHeight != value) {
this.infinityHeight = value; this.infinityHeight = value;
int size = this.rows.size(); for(int i = 0, size = this.rows.size(); i < size; i++) {
for(int i = 0; i < size; i++) {
ItemGroup rowGroup = this.rows.get(i); ItemGroup rowGroup = this.rows.get(i);
rowGroup.setIsLengthInfinity(value); rowGroup.setIsLengthInfinity(value);
} }
@@ -603,20 +601,17 @@ class MeasureHelper {
} }
public void clearMeasureSpecs() { public void clearMeasureSpecs() {
int size = this.columns.size(); for (int i = 0, size = this.columns.size(); i < size; i++) {
for (int i = 0; i < size; i++) {
this.columns.get(i).children.clear(); this.columns.get(i).children.clear();
} }
size = this.rows.size(); for (int i = 0, size = this.rows.size(); i < size; i++) {
for (int i = 0; i < size; i++) {
this.rows.get(i).children.clear(); this.rows.get(i).children.clear();
} }
} }
private static void initList(ArrayList<ItemGroup> list) { private static void initList(ArrayList<ItemGroup> list) {
int size = list.size(); for(int i = 0, size = list.size(); i < size; i++) {
for(int i = 0; i < size; i++) {
ItemGroup item = list.get(i); ItemGroup item = list.get(i);
item.init(); item.init();
} }
@@ -739,15 +734,13 @@ class MeasureHelper {
private void fakeMeasure() { private void fakeMeasure() {
// Fake measure - measure all elements that have star rows and auto columns - with infinity Width and infinity Height // Fake measure - measure all elements that have star rows and auto columns - with infinity Width and infinity Height
int size = this.columns.size(); for (int i = 0, size = this.columns.size(); i < size; i++) {
for (int i = 0; i < size; i++) {
ItemGroup columnGroup = this.columns.get(i); ItemGroup columnGroup = this.columns.get(i);
if (columnGroup.getAllMeasured()) { if (columnGroup.getAllMeasured()) {
continue; continue;
} }
int childrenCount = columnGroup.children.size(); for (int j = 0, childrenCount = columnGroup.children.size(); j < childrenCount; j++) {
for (int j = 0; j < childrenCount; j++) {
MeasureSpecs measureSpec = columnGroup.children.get(j); MeasureSpecs measureSpec = columnGroup.children.get(j);
if (measureSpec.starRowsCount > 0 && measureSpec.autoColumnsCount > 0 && measureSpec.starColumnsCount == 0) { if (measureSpec.starRowsCount > 0 && measureSpec.autoColumnsCount > 0 && measureSpec.starColumnsCount == 0) {
this.measureChild(measureSpec, true); this.measureChild(measureSpec, true);
@@ -757,11 +750,9 @@ class MeasureHelper {
} }
private void measureFixedColumnsNoStarRows() { private void measureFixedColumnsNoStarRows() {
int size = this.columns.size(); for (int i = 0, size = this.columns.size(); i < size; i++) {
for (int i = 0; i < size; i++) {
ItemGroup columnGroup = this.columns.get(i); ItemGroup columnGroup = this.columns.get(i);
int childrenCount = columnGroup.children.size(); for (int j = 0, childrenCount = columnGroup.children.size(); j < childrenCount; j++) {
for (int j = 0; j < childrenCount; j++) {
MeasureSpecs measureSpec = columnGroup.children.get(j); MeasureSpecs measureSpec = columnGroup.children.get(j);
if (measureSpec.starColumnsCount > 0 && measureSpec.starRowsCount == 0) { if (measureSpec.starColumnsCount > 0 && measureSpec.starRowsCount == 0) {
this.measureChildFixedColumns(measureSpec); this.measureChildFixedColumns(measureSpec);
@@ -771,11 +762,9 @@ class MeasureHelper {
} }
private void measureNoStarColumnsFixedRows() { private void measureNoStarColumnsFixedRows() {
int size = this.columns.size(); for (int i = 0, size = this.columns.size(); i < size; i++) {
for (int i = 0; i < size; i++) {
ItemGroup columnGroup = this.columns.get(i); ItemGroup columnGroup = this.columns.get(i);
int childrenCount = columnGroup.children.size(); for (int j = 0, childrenCount = columnGroup.children.size(); j < childrenCount ; j++) {
for (int j = 0; j < childrenCount ; j++) {
MeasureSpecs measureSpec = columnGroup.children.get(j); MeasureSpecs measureSpec = columnGroup.children.get(j);
if (measureSpec.starRowsCount > 0 && measureSpec.starColumnsCount == 0) { if (measureSpec.starRowsCount > 0 && measureSpec.starColumnsCount == 0) {
this.measureChildFixedRows(measureSpec); this.measureChildFixedRows(measureSpec);
@@ -785,8 +774,7 @@ class MeasureHelper {
} }
private static boolean canFix(ArrayList<ItemGroup> list) { private static boolean canFix(ArrayList<ItemGroup> list) {
int size = list.size(); for (int i = 0, size = list.size(); i < size; i++) {
for (int i = 0; i < size; i++) {
ItemGroup item = list.get(i); ItemGroup item = list.get(i);
if(!item.getCanBeFixed()) { if(!item.getCanBeFixed()) {
return false; return false;
@@ -798,8 +786,7 @@ class MeasureHelper {
private static int getMeasureLength(ArrayList<ItemGroup> list) { private static int getMeasureLength(ArrayList<ItemGroup> list) {
int result = 0; int result = 0;
int size = list.size(); for (int i = 0, size = list.size(); i < size; i++) {
for (int i = 0; i < size; i++) {
ItemGroup item = list.get(i); ItemGroup item = list.get(i);
result += item.length; result += item.length;
} }
@@ -813,8 +800,7 @@ class MeasureHelper {
int size = this.columns.size(); int size = this.columns.size();
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
ItemGroup columnGroup = this.columns.get(i); ItemGroup columnGroup = this.columns.get(i);
int childrenCount = columnGroup.children.size(); for (int j = 0, childrenCount = columnGroup.children.size(); j < childrenCount; j++) {
for (int j = 0; j < childrenCount; j++) {
MeasureSpecs measureSpec = columnGroup.children.get(j); MeasureSpecs measureSpec = columnGroup.children.get(j);
if (measureSpec.getIsStar() || measureSpec.getSpanned()) { if (measureSpec.getIsStar() || measureSpec.getSpanned()) {
continue; continue;
@@ -827,8 +813,7 @@ class MeasureHelper {
// Measure auto & pixel columns and rows (with spans). // Measure auto & pixel columns and rows (with spans).
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
ItemGroup columnGroup = this.columns.get(i); ItemGroup columnGroup = this.columns.get(i);
int childrenCount = columnGroup.children.size(); for (int j = 0, childrenCount = columnGroup.children.size(); j < childrenCount; j++) {
for (int j = 0; j < childrenCount; j++) {
MeasureSpecs measureSpec = columnGroup.children.get(j); MeasureSpecs measureSpec = columnGroup.children.get(j);
if (measureSpec.getIsStar() || !measureSpec.getSpanned()) { if (measureSpec.getIsStar() || !measureSpec.getSpanned()) {
continue; continue;
@@ -881,8 +866,7 @@ class MeasureHelper {
size = this.columns.size(); size = this.columns.size();
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
ItemGroup columnGroup = this.columns.get(i); ItemGroup columnGroup = this.columns.get(i);
int childCount = columnGroup.children.size(); for (int j = 0, childCount = columnGroup.children.size(); j < childCount; j++) {
for (int j = 0; j < childCount; j++) {
MeasureSpecs measureSpec = columnGroup.children.get(j); MeasureSpecs measureSpec = columnGroup.children.get(j);
if (!measureSpec.measured) { if (!measureSpec.measured) {
this.measureChildFixedColumnsAndRows(measureSpec); this.measureChildFixedColumnsAndRows(measureSpec);