Updated Branches: refs/heads/develop 0609b6dd6 -> bb3c62b75
Cleaned up DataGridView - removed unused, commented code; changed size handler so columns layout properly. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/bb3c62b7 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/bb3c62b7 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/bb3c62b7 Branch: refs/heads/develop Commit: bb3c62b75e615f438869a5b63dfb8c1699dc1acd Parents: 0609b6d Author: Peter Ent <[email protected]> Authored: Wed Jan 29 15:02:31 2014 -0500 Committer: Peter Ent <[email protected]> Committed: Wed Jan 29 15:02:31 2014 -0500 ---------------------------------------------------------------------- .../html/staticControls/beads/DataGridView.as | 23 ++++---------------- 1 file changed, 4 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bb3c62b7/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataGridView.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataGridView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataGridView.as index f73a265..af12865 100644 --- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataGridView.as +++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataGridView.as @@ -59,9 +59,6 @@ package org.apache.flex.html.staticControls.beads var sharedModel:IDataGridModel = _strand.getBeadByType(IBeadModel) as IDataGridModel; - //background = new Shape(); - //DisplayObjectContainer(_strand).addChild(background); - // create an array of columnLabels for use by the ButtonBar/DataGrid header. var columnLabels:Array = new Array(); var buttonWidths:Array = new Array(); @@ -122,32 +119,19 @@ package org.apache.flex.html.staticControls.beads var value:Object = ValuesManager.valuesImpl.getValue(_strand, "background-color"); if (value != null) backgroundColor = Number(value); - //background.graphics.clear(); - //background.graphics.beginFill(backgroundColor); - //background.graphics.drawRect(0,0,sw,sh); - //background.graphics.endFill(); - buttonBar.x = 0; buttonBar.y = 0; - buttonBar.width = sw; + buttonBar.width = sw + (2*columns.length-1); buttonBar.height = 25; columnContainer.x = 0; columnContainer.y = 30; - columnContainer.width = sw; + columnContainer.width = sw + columns.length*2; columnContainer.height = sh - 25; - var colXpos:Number = 0; - for(var i:int=0; i < columns.length; i++) { var column:List = columns[i]; - - var cw:Number = sw/(columns.length); - column.y = 0; - column.x = colXpos; - column.height = columnContainer.height; // this will actually be Nitem*rowHeight - - colXpos += column.width; + column.height = columnContainer.height; // this will actually be Nitem*rowHeight eventually } IEventDispatcher(_strand).dispatchEvent(new Event("layoutComplete")); @@ -172,6 +156,7 @@ package org.apache.flex.html.staticControls.beads private function columnListRollOverHandler(event:Event):void { var list:List = event.target as List; + if (list == null) return; for(var i:int=0; i < columns.length; i++) { if (list != columns[i]) { var otherList:List = columns[i] as List;
