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 2015/07/13 16:15:46 UTC
git commit: [flex-asjs] [refs/heads/develop] - More tuning on
Container and layouts for ButtonBar and DataGrid.
Repository: flex-asjs
Updated Branches:
refs/heads/develop 8307b5306 -> 7d57ff92c
More tuning on Container and layouts for ButtonBar and DataGrid.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/7d57ff92
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7d57ff92
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7d57ff92
Branch: refs/heads/develop
Commit: 7d57ff92ca7ce46ef87b4d17c7ac481688b74fd4
Parents: 8307b53
Author: Peter Ent <pe...@apache.org>
Authored: Mon Jul 13 10:15:40 2015 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Mon Jul 13 10:15:40 2015 -0400
----------------------------------------------------------------------
.../src/org/apache/flex/html/beads/ButtonBarView.as | 15 +++++++++++++++
.../src/org/apache/flex/html/beads/ContainerView.as | 10 +++++++---
.../as/src/org/apache/flex/html/beads/ListView.as | 8 +++++++-
.../src/org/apache/flex/html/beads/DataGridView.as | 1 +
.../apache/flex/html/beads/layouts/DataGridLayout.as | 1 +
5 files changed, 31 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7d57ff92/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ButtonBarView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ButtonBarView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ButtonBarView.as
index 5a89c55..378d9b4 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ButtonBarView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ButtonBarView.as
@@ -27,6 +27,7 @@ package org.apache.flex.html.beads
import org.apache.flex.core.IParent;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.ValuesManager;
+ import org.apache.flex.core.UIBase;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
import org.apache.flex.html.supportClasses.Border;
@@ -70,5 +71,19 @@ package org.apache.flex.html.beads
_strand = value;
super.strand = value;
}
+
+ override protected function resizeHandler(event:Event):void
+ {
+ // the ButtonBar is always matched to its size so it is
+ // important that the contentWidth/Height match the host's
+ // width/height
+
+ trace("BBSize: "+UIBase(host).width);
+
+ viewportModel.contentWidth = UIBase(host).width;
+ viewportModel.contentHeight = UIBase(host).height;
+
+ super.resizeHandler(event);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7d57ff92/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as
index 3285544..e201c64 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as
@@ -94,8 +94,6 @@ package org.apache.flex.html.beads
(host as UIBase).addElement(_contentArea,false);
ContainerBase(host).setActualParent(_contentArea as DisplayObjectContainer);
- createViewport();
-
displayBackgroundAndBorder(host as UIBase);
if (isNaN((host as UIBase).percentHeight) && isNaN((host as UIBase).percentWidth)) {
@@ -124,7 +122,9 @@ package org.apache.flex.html.beads
protected function completeSetup():void
{
- (contentView as UIBase).setWidthAndHeight(host.width, host.height, true);
+ createViewport();
+
+ (contentView as UIBase).setWidthAndHeight(viewportModel.contentWidth, viewportModel.contentHeight, true);
host.addEventListener("childrenAdded", childrenChangedHandler);
host.addEventListener("childrenAdded", performLayout);
@@ -168,6 +168,10 @@ package org.apache.flex.html.beads
viewportModel.contentArea = contentView;
viewportModel.contentIsHost = false;
+ viewportModel.contentWidth = host.width;
+ viewportModel.contentHeight = host.height;
+ viewportModel.contentX = 0;
+ viewportModel.contentY = 0;
resizeViewport();
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7d57ff92/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListView.as
index eca6248..08bea38 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListView.as
@@ -146,7 +146,13 @@ package org.apache.flex.html.beads
override protected function completeSetup():void
{
super.completeSetup();
- IEventDispatcher(_strand).addEventListener("itemsCreated", performLayout);
+
+ // list is not interested in UI children, it wants to know when new items
+ // have been added or the dataProvider has changed.
+
+ host.removeEventListener("childrenAdded", childrenChangedHandler);
+ host.removeEventListener("childrenAdded", performLayout);
+ host.addEventListener("itemsCreated", performLayout);
listModel = _strand.getBeadByType(ISelectionModel) as ISelectionModel;
listModel.addEventListener("selectedIndexChanged", selectionChangeHandler);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7d57ff92/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/DataGridView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/DataGridView.as b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/DataGridView.as
index 61bac6b..11ff800 100644
--- a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/DataGridView.as
+++ b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/DataGridView.as
@@ -121,6 +121,7 @@ package org.apache.flex.html.beads
buttonBar.addBead(buttonBarModel);
buttonBar.addBead(bblayout);
buttonBar.height = 25;
+ buttonBar.width = UIBase(_strand).width;
UIBase(_strand).addElement(buttonBar);
// Create a List for each column, storing a reference to each List in
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7d57ff92/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/DataGridLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/DataGridLayout.as b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/DataGridLayout.as
index d857ac1..f6849ce 100644
--- a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/DataGridLayout.as
+++ b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/DataGridLayout.as
@@ -149,6 +149,7 @@ package org.apache.flex.html.beads.layouts
header.x = 0;
header.y = 0;
header.width = sw;
+ header.dispatchEvent(new Event("layoutNeeded"));
return true;
}