|
@@ -533,7 +533,8 @@
|
|
|
|
|
|
}else if(row.heightType == GridDimensionDefinition.Pixels){
|
|
}else if(row.heightType == GridDimensionDefinition.Pixels){
|
|
|
|
|
|
- this._rowHeights[i] = row.heightPixels;
|
|
|
|
|
|
+ let maxChildHeight = this._getMaxChildHeightInRow(i);
|
|
|
|
+ this._rowHeights[i] = Math.max(row.heightPixels, maxChildHeight);
|
|
rowHeights += this._rowHeights[i];
|
|
rowHeights += this._rowHeights[i];
|
|
|
|
|
|
}else if(row.heightType == GridDimensionDefinition.Stars){
|
|
}else if(row.heightType == GridDimensionDefinition.Stars){
|
|
@@ -556,7 +557,10 @@
|
|
|
|
|
|
let rowIndex = starIndexes[i];
|
|
let rowIndex = starIndexes[i];
|
|
|
|
|
|
- this._rowHeights[rowIndex] = (this._rows[rowIndex].height / totalStars) * remainingHeight;
|
|
|
|
|
|
+ let starHeight = (this._rows[rowIndex].height / totalStars) * remainingHeight;
|
|
|
|
+ let maxChildHeight = this._getMaxChildHeightInRow(i);
|
|
|
|
+
|
|
|
|
+ this._rowHeights[rowIndex] = Math.max(starHeight, maxChildHeight);
|
|
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -578,7 +582,8 @@
|
|
|
|
|
|
}else if(column.widthType == GridDimensionDefinition.Pixels){
|
|
}else if(column.widthType == GridDimensionDefinition.Pixels){
|
|
|
|
|
|
- this._columnWidths[i] = column.widthPixels;
|
|
|
|
|
|
+ let maxChildWidth = this._getMaxChildWidthInColumn(i);
|
|
|
|
+ this._columnWidths[i] = Math.max(column.widthPixels, maxChildWidth);
|
|
columnWidths += this._columnWidths[i];
|
|
columnWidths += this._columnWidths[i];
|
|
|
|
|
|
}else if(column.widthType == GridDimensionDefinition.Stars){
|
|
}else if(column.widthType == GridDimensionDefinition.Stars){
|
|
@@ -601,7 +606,10 @@
|
|
|
|
|
|
let columnIndex = starIndexes[i];
|
|
let columnIndex = starIndexes[i];
|
|
|
|
|
|
- this._columnWidths[columnIndex] = (this._columns[columnIndex].width / totalStars) * remainingWidth;
|
|
|
|
|
|
+ let starWidth = (this._columns[columnIndex].width / totalStars) * remainingWidth;
|
|
|
|
+ let maxChildWidth = this._getMaxChildWidthInColumn(i);
|
|
|
|
+
|
|
|
|
+ this._columnWidths[columnIndex] = Math.max(starWidth, maxChildWidth);
|
|
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|