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 2013/06/27 17:46:18 UTC
git commit: [flex-asjs] [refs/heads/develop] - Modified PanelBead to
extend ContainerBead and created protected property, actualParent,
on ContainerBead for PanelBead's use in layout. Updated TitleBar to set an id
for CSS purposes.
Updated Branches:
refs/heads/develop 653567f8c -> b116436ad
Modified PanelBead to extend ContainerBead and created protected property, actualParent, on ContainerBead for PanelBead's use in layout. Updated TitleBar to set an id for CSS purposes.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b116436a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b116436a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b116436a
Branch: refs/heads/develop
Commit: b116436ad22311cc048bb60a4a8e506e8eda3238
Parents: 653567f
Author: Peter Ent <pe...@apache.org>
Authored: Thu Jun 27 11:46:03 2013 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Thu Jun 27 11:46:03 2013 -0400
----------------------------------------------------------------------
.../apache/flex/html/staticControls/Panel.as | 2 -
.../apache/flex/html/staticControls/TitleBar.as | 2 +
.../html/staticControls/beads/ContainerBead.as | 8 ++-
.../flex/html/staticControls/beads/PanelBead.as | 57 +++-----------------
4 files changed, 17 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b116436a/frameworks/as/src/org/apache/flex/html/staticControls/Panel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/Panel.as b/frameworks/as/src/org/apache/flex/html/staticControls/Panel.as
index 2c43c8b..94c8391 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/Panel.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/Panel.as
@@ -22,8 +22,6 @@ package org.apache.flex.html.staticControls
import org.apache.flex.core.IPanelModel;
import org.apache.flex.core.ValuesManager;
import org.apache.flex.events.Event;
- import org.apache.flex.html.staticControls.beads.IBackgroundBead;
- import org.apache.flex.html.staticControls.beads.IBorderBead;
import org.apache.flex.html.staticControls.beads.IPanelBead;
import org.apache.flex.html.staticControls.beads.PanelBead;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b116436a/frameworks/as/src/org/apache/flex/html/staticControls/TitleBar.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/TitleBar.as b/frameworks/as/src/org/apache/flex/html/staticControls/TitleBar.as
index 7c364c8..3888207 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/TitleBar.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/TitleBar.as
@@ -96,10 +96,12 @@ package org.apache.flex.html.staticControls
// add the label for the title and the button for the close
_titleLabel = createTitle();
_titleLabel.className = className;
+ _titleLabel.id = "title";
_titleLabel.addToParent(this);
_closeButton = createCloseButton();
_closeButton.className = className;
+ _closeButton.id = "closeButton";
_closeButton.addToParent(this);
childrenAdded();
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b116436a/frameworks/as/src/org/apache/flex/html/staticControls/beads/ContainerBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/ContainerBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/ContainerBead.as
index a67db7b..761c601 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/ContainerBead.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/ContainerBead.as
@@ -31,6 +31,8 @@ package org.apache.flex.html.staticControls.beads
public function ContainerBead()
{
}
+
+ protected var actualParent:DisplayObjectContainer;
private var _strand:IStrand;
@@ -94,12 +96,16 @@ package org.apache.flex.html.staticControls.beads
if ((!isNaN(pl) && pl > 0 ||
!isNaN(pt) && pt > 0))
{
- var actualParent:Sprite = new Sprite();
+ actualParent = new Sprite();
DisplayObjectContainer(value).addChild(actualParent);
Container(value).setActualParent(actualParent);
actualParent.x = pl;
actualParent.y = pt;
}
+ else
+ {
+ actualParent = value as DisplayObjectContainer;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b116436a/frameworks/as/src/org/apache/flex/html/staticControls/beads/PanelBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/PanelBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/PanelBead.as
index ffac85d..8af730b 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/PanelBead.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/PanelBead.as
@@ -35,7 +35,7 @@ package org.apache.flex.html.staticControls.beads
import org.apache.flex.html.staticControls.TitleBar;
import org.apache.flex.utils.BeadMetrics;
- public class PanelBead implements IBead, IContainerBead
+ public class PanelBead extends ContainerBead implements IBead, IContainerBead
{
public function PanelBead()
{
@@ -58,8 +58,9 @@ package org.apache.flex.html.staticControls.beads
private var _strand:IStrand;
- public function set strand(value:IStrand):void
+ override public function set strand(value:IStrand):void
{
+ super.strand = value;
_strand = value;
Container(_strand).addChild(titleBar);
@@ -77,51 +78,9 @@ package org.apache.flex.html.staticControls.beads
Container(_strand).addChild(controlBar);
}
- var paddingLeft:Object;
- var paddingTop:Object;
- var padding:Object = ValuesManager.valuesImpl.getValue(value, "padding");
- if (padding is Array)
- {
- if (padding.length == 1)
- paddingLeft = paddingTop = padding[0];
- else if (padding.length <= 3)
- {
- paddingLeft = padding[1];
- paddingTop = padding[0];
- }
- else if (padding.length == 4)
- {
- paddingLeft = padding[3];
- paddingTop = padding[0];
- }
- }
- else if (padding == null)
- {
- paddingLeft = ValuesManager.valuesImpl.getValue(value, "padding-left");
- paddingTop = ValuesManager.valuesImpl.getValue(value, "padding-top");
- }
- else
- {
- paddingLeft = paddingTop = padding;
- }
- var pl:Number = Number(paddingLeft);
- var pt:Number = Number(paddingTop);
-
- if( isNaN(pl) ) pl = 0;
- if( isNaN(pt) ) pt = 0;
-
- var actualParent:Sprite = new Sprite();
- DisplayObjectContainer(value).addChild(actualParent);
- Container(value).setActualParent(actualParent);
- actualParent.x = pl;
- actualParent.y = pt;
-
- contentArea = actualParent;
-
IEventDispatcher(_strand).addEventListener("childrenAdded", changeHandler);
}
- private var contentArea:DisplayObjectContainer;
private var controlBarArea:ControlBar;
private function changeHandler(event:Event):void
@@ -132,17 +91,17 @@ package org.apache.flex.html.staticControls.beads
titleBar.y = metrics.top;
titleBar.width = UIBase(_strand).width - (metrics.left + metrics.right);
- contentArea.x = metrics.left;
- contentArea.y = titleBar.y + titleBar.height;
- contentArea.width = UIBase(_strand).width - (metrics.left + metrics.right);
+ actualParent.x = metrics.left;
+ actualParent.y = titleBar.y + titleBar.height;
+ actualParent.width = UIBase(_strand).width - (metrics.left + metrics.right);
if( controlBar ) {
controlBar.x = metrics.left;
- controlBar.y = contentArea.y + contentArea.height;
+ controlBar.y = actualParent.y + actualParent.height;
controlBar.width = UIBase(_strand).width - (metrics.left + metrics.right);
}
- UIBase(_strand).height = metrics.top + metrics.bottom + titleBar.height + contentArea.height +
+ UIBase(_strand).height = metrics.top + metrics.bottom + titleBar.height + actualParent.height +
(controlBar ? controlBar.height : 0);
}
}