You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pe...@apache.org on 2017/05/04 14:29:47 UTC
git commit: [flex-asjs] [refs/heads/develop] - Changed
SimpleTableLayout to better mimic the HTML table. Removed default styles for
table header and cells.
Repository: flex-asjs
Updated Branches:
refs/heads/develop b00c575f1 -> 02ec79352
Changed SimpleTableLayout to better mimic the HTML table. Removed default styles for table header and cells.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/02ec7935
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/02ec7935
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/02ec7935
Branch: refs/heads/develop
Commit: 02ec79352dff3f586996956a87957514aa472c8e
Parents: b00c575
Author: Peter Ent <pe...@apache.org>
Authored: Thu May 4 10:29:45 2017 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Thu May 4 10:29:45 2017 -0400
----------------------------------------------------------------------
.../flex/html/beads/layouts/SimpleTableLayout.as | 19 ++++++++++++-------
.../Basic/src/main/resources/defaults.css | 8 +++++---
2 files changed, 17 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/02ec7935/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/SimpleTableLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/SimpleTableLayout.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/SimpleTableLayout.as
index bf8b35a..ead0115 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/SimpleTableLayout.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/SimpleTableLayout.as
@@ -75,13 +75,12 @@ package org.apache.flex.html.beads.layouts
var hostWidth:Number = hostWidthSizedToContent ? host.width : contentView.width;
var hostHeight:Number = hostHeightSizedToContent ? host.height : contentView.height;
- var paddingMetrics:Rectangle = CSSContainerUtils.getPaddingMetrics(host);
var borderMetrics:Rectangle = CSSContainerUtils.getBorderMetrics(host);
// adjust the host's usable size by the metrics. If hostSizedToContent, then the
// resulting adjusted value may be less than zero.
- hostWidth -= paddingMetrics.left + paddingMetrics.right + borderMetrics.left + borderMetrics.right;
- hostHeight -= paddingMetrics.top + paddingMetrics.bottom + borderMetrics.top + borderMetrics.bottom;
+ hostWidth -= borderMetrics.left + borderMetrics.right;
+ hostHeight -= borderMetrics.top + borderMetrics.bottom;
var numRows:int = n;
var numCols:int = 0;
@@ -172,7 +171,7 @@ package org.apache.flex.html.beads.layouts
defaultColWidth = remainingWidth / needsDefaultColWidthCount;
defaultRowHeight = remainingHeight / needsDefaultRowHeightCount;
- var ypos:Number = paddingMetrics.top + borderMetrics.top;
+ var ypos:Number = borderMetrics.top;
// pass4: size everything
for(i=0; i < n; i++)
@@ -180,7 +179,13 @@ package org.apache.flex.html.beads.layouts
row = contentView.getElementAt(i) as TableRow;
if (row == null || !row.visible) continue;
- var xpos:Number = paddingMetrics.left + borderMetrics.left;
+ var xpos:Number = borderMetrics.left;
+
+ // the row is an actual display object that can have border and
+ // background so it must be placed and sized.
+ row.x = xpos;
+ row.y = ypos;
+ row.setWidthAndHeight(hostWidth, rowHeights[i]);
for(j=0; j < row.numElements; j++)
{
@@ -191,12 +196,12 @@ package org.apache.flex.html.beads.layouts
var useHeight:Number = rowHeights[i] > 0 ? rowHeights[i] : defaultRowHeight;
cell.x = xpos;
- cell.y = ypos;
+ cell.y = 0;
cell.setWidthAndHeight(useWidth, useHeight);
xpos += useWidth;
}
-
+
ypos += rowHeights[i] > 0 ? rowHeights[i] : defaultRowHeight;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/02ec7935/frameworks/projects/Basic/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/resources/defaults.css b/frameworks/projects/Basic/src/main/resources/defaults.css
index be9a3bd..7a13798 100644
--- a/frameworks/projects/Basic/src/main/resources/defaults.css
+++ b/frameworks/projects/Basic/src/main/resources/defaults.css
@@ -376,17 +376,19 @@ Accordion
Table
{
IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.SimpleTableLayout");
+
+ /* mimic SWF version which does not support border-collapse */
+ border-collapse: collapse;
}
TableHeader
{
- font-weight: bold;
- border: 1px solid #999999;
+ /* use browser default style */
}
TableCell
{
- border: 1px solid #999999;
+ /* use browser default style */
}
Tree