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/04/14 20:47:20 UTC
[1/8] git commit: [flex-asjs] [refs/heads/develop] - Initial changes
for Mobile project.
Repository: flex-asjs
Updated Branches:
refs/heads/develop ae5cb4e17 -> 5cb269d97
Initial changes for Mobile project.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e0b3528a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e0b3528a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e0b3528a
Branch: refs/heads/develop
Commit: e0b3528a795f1a99987ce5e25cc7f89986b6d735
Parents: ae5cb4e
Author: Peter Ent <pe...@apache.org>
Authored: Wed Apr 12 15:39:56 2017 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Wed Apr 12 15:39:56 2017 -0400
----------------------------------------------------------------------
.../ButtonBarButtonItemRenderer.as | 34 +++-
.../Mobile/src/main/flex/MobileClasses.as | 1 +
.../apache/flex/mobile/ManagedContentArea.as | 55 ++++++
.../apache/flex/mobile/StackedViewManager.as | 51 ++++--
.../org/apache/flex/mobile/TabbedViewManager.as | 42 +++++
.../flex/org/apache/flex/mobile/TitleView.as | 4 -
.../org/apache/flex/mobile/ViewManagerBase.as | 52 ++----
.../flex/mobile/beads/StackedViewManagerView.as | 175 +++++++++++++------
.../flex/mobile/beads/TabbedViewManagerView.as | 175 +++++++++++++------
.../flex/mobile/beads/ViewManagerViewBase.as | 123 ++++++-------
.../src/main/resources/basic-manifest.xml | 1 +
.../Mobile/src/main/resources/defaults.css | 21 +++
12 files changed, 511 insertions(+), 223 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e0b3528a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.as
index 214125e..4e7ed07 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.as
@@ -26,6 +26,11 @@ package org.apache.flex.html.supportClasses
import org.apache.flex.html.TextButton;
import org.apache.flex.html.beads.ITextItemRenderer;
import org.apache.flex.events.ItemClickedEvent;
+
+ COMPILE::JS
+ {
+ import org.apache.flex.core.WrappedHTMLElement;
+ }
/**
* The ButtonBarButtonItemRenderer class handles the display of each item for the
@@ -52,6 +57,18 @@ package org.apache.flex.html.supportClasses
super();
}
+ /**
+ * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+ * @flexjsignorecoercion HTMLElement
+ */
+ COMPILE::JS
+ override protected function createElement():WrappedHTMLElement
+ {
+ var result:WrappedHTMLElement = super.createElement();
+ trace("Element "+element+"; positioner "+positioner);
+ return result;
+ }
+
protected var textButton:TextButton;
/**
@@ -96,8 +113,14 @@ package org.apache.flex.html.supportClasses
*/
override public function setWidth(value:Number, noEvent:Boolean = false):void
{
- super.setWidth(value, noEvent);
+ super.setWidth(value, true);
textButton.width = value;
+ COMPILE::SWF {
+ textButton.height = height;
+ }
+ COMPILE::JS {
+ textButton.percentHeight = 100;
+ }
}
/**
@@ -105,8 +128,14 @@ package org.apache.flex.html.supportClasses
*/
override public function setHeight(value:Number, noEvent:Boolean = false):void
{
- super.setHeight(value, noEvent);
+ super.setHeight(value, true);
textButton.height = value;
+ COMPILE::SWF {
+ textButton.width = width;
+ }
+ COMPILE::JS {
+ textButton.percentWidth = 100;
+ }
}
/**
@@ -125,7 +154,6 @@ package org.apache.flex.html.supportClasses
var added:Boolean = false;
if (textButton == null) {
textButton = new TextButton();
- textButton.percentWidth = 100;
// listen for clicks on the button and translate them into
// an itemClicked event.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e0b3528a/frameworks/projects/Mobile/src/main/flex/MobileClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/MobileClasses.as b/frameworks/projects/Mobile/src/main/flex/MobileClasses.as
index 7c650fd..ea74217 100644
--- a/frameworks/projects/Mobile/src/main/flex/MobileClasses.as
+++ b/frameworks/projects/Mobile/src/main/flex/MobileClasses.as
@@ -33,6 +33,7 @@ internal class MobileClasses
import org.apache.flex.mobile.beads.DatePickerView; DatePickerView;
import org.apache.flex.mobile.ToggleSwitch; ToggleSwitch;
import org.apache.flex.mobile.ViewManagerBase; ViewManagerBase;
+ import org.apache.flex.mobile.ManagedContentArea; ManagedContentArea;
import org.apache.flex.mobile.beads.StackedViewManagerView; StackedViewManagerView;
import org.apache.flex.mobile.beads.TabbedViewManagerView; TabbedViewManagerView;
import org.apache.flex.mobile.beads.ViewManagerViewBase; ViewManagerViewBase;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e0b3528a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ManagedContentArea.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ManagedContentArea.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ManagedContentArea.as
new file mode 100644
index 0000000..16081e5
--- /dev/null
+++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ManagedContentArea.as
@@ -0,0 +1,55 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.mobile
+{
+ import org.apache.flex.core.UIBase;
+ import org.apache.flex.html.Group;
+ import org.apache.flex.events.Event;
+
+ COMPILE::JS
+ {
+ import org.apache.flex.core.WrappedHTMLElement;
+ }
+
+ /**
+ * The ManagedContentArea is the space in which views are displayed by the
+ * view manager classes.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class ManagedContentArea extends Group
+ {
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function ManagedContentArea()
+ {
+ super();
+ className = "ManagedContentArea";
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e0b3528a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/StackedViewManager.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/StackedViewManager.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/StackedViewManager.as
index 9322e66..79368fd 100644
--- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/StackedViewManager.as
+++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/StackedViewManager.as
@@ -26,6 +26,7 @@ package org.apache.flex.mobile
import org.apache.flex.mobile.chrome.NavigationBar;
import org.apache.flex.mobile.chrome.ToolBar;
import org.apache.flex.mobile.models.ViewManagerModel;
+ import org.apache.flex.mobile.beads.StackedViewManagerView;
[Event(name="viewChanged",type="org.apache.flex.events.Event")]
@@ -127,6 +128,22 @@ package org.apache.flex.mobile
{
return _topView;
}
+
+ /**
+ * @private
+ */
+ override public function addedToParent():void
+ {
+ super.addedToParent();
+
+// var tabbedView:StackedViewManagerView = getBeadByType(StackedViewManagerView) as StackedViewManagerView;
+//
+// var n:int = ViewManagerModel(model).views.length;
+// if (n > 0) {
+// var view:IViewManagerView = ViewManagerModel(model).views[0] as IViewManagerView;
+// push(view);
+// }
+ }
/**
@@ -142,13 +159,15 @@ package org.apache.flex.mobile
nextView.viewManager = this;
ViewManagerModel(model).pushView(nextView);
- if (_topView != null) {
- removeElement(_topView);
- }
- _topView = nextView;
- addElement(_topView);
-
- dispatchEvent( new Event("viewChanged") );
+// var stackedView:StackedViewManagerView = getBeadByType(StackedViewManagerView) as StackedViewManagerView;
+//
+// if (_topView != null) {
+// stackedView.contentArea.removeElement(_topView);
+// }
+// _topView = nextView;
+// stackedView.contentArea.addElement(_topView);
+//
+// dispatchEvent( new Event("viewChanged") );
}
/**
@@ -161,14 +180,16 @@ package org.apache.flex.mobile
*/
public function pop():void
{
- if (ViewManagerModel(model).views.length > 1) {
- var lastView:IChild = ViewManagerModel(model).popView() as IChild;
- removeElement(_topView);
- addElement(lastView);
- _topView = lastView as IViewManagerView;
-
- dispatchEvent( new Event("viewChanged") );
- }
+ var stackedView:StackedViewManagerView = getBeadByType(StackedViewManagerView) as StackedViewManagerView;
+
+// if (ViewManagerModel(model).views.length > 1) {
+// var lastView:IChild = ViewManagerModel(model).popView() as IChild;
+// stackedView.contentArea.removeElement(_topView);
+// stackedView.contentArea.addElement(lastView);
+// _topView = lastView as IViewManagerView;
+//
+// dispatchEvent( new Event("viewChanged") );
+// }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e0b3528a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TabbedViewManager.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TabbedViewManager.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TabbedViewManager.as
index 243e285..3b0d89d 100644
--- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TabbedViewManager.as
+++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TabbedViewManager.as
@@ -18,11 +18,13 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.mobile
{
+ import org.apache.flex.events.Event;
import org.apache.flex.html.Container;
import org.apache.flex.mobile.IViewManagerView;
import org.apache.flex.mobile.IViewManager;
import org.apache.flex.mobile.chrome.TabBar;
import org.apache.flex.mobile.models.ViewManagerModel;
+ import org.apache.flex.mobile.beads.TabbedViewManagerView;
[Event(name="viewChanged",type="org.apache.flex.events.Event")]
@@ -82,6 +84,46 @@ package org.apache.flex.mobile
{
ViewManagerModel(model).selectedIndex = value;
}
+
+ /**
+ * @private
+ */
+ override public function addedToParent():void
+ {
+ super.addedToParent();
+
+// var tabbedView:TabbedViewManagerView = getBeadByType(TabbedViewManagerView) as TabbedViewManagerView;
+//
+// var n:int = ViewManagerModel(model).views.length;
+// if (n > 0) {
+// for (var i:int = 0; i < n; i++)
+// {
+// var view:IViewManagerView = ViewManagerModel(model).views[i] as IViewManagerView;
+// view.viewManager = this;
+// if (i == 0) {
+// tabbedView.contentArea.addElement(view, true);
+// }
+// }
+// ViewManagerModel(model).selectedIndex = 0;
+// }
+ }
+
+ /**
+ * @private
+ */
+ override protected function changeView( event:Event ):void
+ {
+// var tabbedView:TabbedViewManagerView = getBeadByType(TabbedViewManagerView) as TabbedViewManagerView;
+//
+// var index:Number = ViewManagerModel(model).selectedIndex;
+// if (currentView) {
+// tabbedView.contentArea.removeElement(currentView);
+// }
+// currentView = views[index];
+// tabbedView.contentArea.addElement(currentView);
+//
+// dispatchEvent( new Event("viewChanged") );
+ }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e0b3528a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TitleView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TitleView.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TitleView.as
index 504f62e..0200e72 100644
--- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TitleView.as
+++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TitleView.as
@@ -33,10 +33,6 @@ package org.apache.flex.mobile
public function TitleView()
{
super();
-
- // views always take up 100% of their space
- percentWidth = 100;
- percentHeight = 100;
}
private var _title:String;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e0b3528a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ViewManagerBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ViewManagerBase.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ViewManagerBase.as
index 6d7175e..cc16ae3 100644
--- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ViewManagerBase.as
+++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ViewManagerBase.as
@@ -20,15 +20,12 @@ package org.apache.flex.mobile
{
import org.apache.flex.core.UIBase;
import org.apache.flex.events.Event;
- import org.apache.flex.html.Container;
+ import org.apache.flex.html.Group;
import org.apache.flex.mobile.IViewManagerView;
import org.apache.flex.mobile.IViewManager;
import org.apache.flex.mobile.chrome.NavigationBar;
import org.apache.flex.mobile.models.ViewManagerModel;
-// import org.apache.flex.html.beads.SolidBackgroundBead;
-// import org.apache.flex.html.beads.SingleLineBorderBead;
-
/**
* Event dispatched when the current (selected) view changes.
*
@@ -47,7 +44,7 @@ package org.apache.flex.mobile
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class ViewManagerBase extends UIBase implements IViewManager
+ public class ViewManagerBase extends Group implements IViewManager
{
/**
* Constructor.
@@ -61,9 +58,7 @@ package org.apache.flex.mobile
percentHeight = 100;
model.addEventListener("selectedIndexChanged", changeView);
-
-// addBead(new SolidBackgroundBead());
-// addBead(new SingleLineBorderBead());
+
}
/**
@@ -162,40 +157,21 @@ package org.apache.flex.mobile
/**
* @private
*/
- override public function addedToParent():void
+ protected function changeView( event:Event ):void
{
- super.addedToParent();
-
- var n:int = ViewManagerModel(model).views.length;
- if (n > 0) {
- for (var i:int = 0; i < n; i++)
- {
- var view:IViewManagerView = ViewManagerModel(model).views[i] as IViewManagerView;
- view.viewManager = this;
- if (i == 0) {
- addElement(view, true);
- }
- }
- ViewManagerModel(model).selectedIndex = 0;
- }
- }
-
- /**
- * @private
- */
- private function changeView( event:Event ):void
- {
- var index:Number = ViewManagerModel(model).selectedIndex;
- if (_currentView) {
- removeElement(_currentView);
- }
- _currentView = views[index];
- addElement(_currentView);
-
- dispatchEvent( new Event("viewChanged") );
+ // handled in subclass
}
private var _currentView:IViewManagerView;
+ public function get currentView():IViewManagerView
+ {
+ return _currentView;
+ }
+ public function set currentView(value:IViewManagerView):void
+ {
+ _currentView = value;
+ // probably need to dispatch an event or do something more complex
+ }
/**
* The currently visible view.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e0b3528a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/StackedViewManagerView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/StackedViewManagerView.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/StackedViewManagerView.as
index 85368ae..bd99b00 100644
--- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/StackedViewManagerView.as
+++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/StackedViewManagerView.as
@@ -26,6 +26,8 @@ package org.apache.flex.mobile.beads
import org.apache.flex.events.Event;
import org.apache.flex.html.beads.ContainerView;
import org.apache.flex.html.beads.layouts.HorizontalLayout;
+ import org.apache.flex.mobile.IViewManagerView;
+ import org.apache.flex.mobile.ManagedContentArea;
import org.apache.flex.mobile.chrome.NavigationBar;
import org.apache.flex.mobile.chrome.ToolBar;
import org.apache.flex.mobile.models.ViewManagerModel;
@@ -54,74 +56,145 @@ package org.apache.flex.mobile.beads
super();
}
- private var _toolBar:ToolBar;
-
+ private var _strand:IStrand;
+ private var _contentArea:ManagedContentArea;
+
+ public function get contentArea():ManagedContentArea
+ {
+ return _contentArea;
+ }
+
+ public function get toolBar():ToolBar
+ {
+ var model:ViewManagerModel = strand.getBeadByType(IBeadModel) as ViewManagerModel;
+ return model.toolBar;
+ }
+ public function set toolBar(value:ToolBar):void
+ {
+ var model:ViewManagerModel = strand.getBeadByType(IBeadModel) as ViewManagerModel;
+ model.toolBar = value;
+ }
+
+ override public function get strand():IStrand
+ {
+ return _strand;
+ }
override public function set strand(value:IStrand):void
{
+ _strand = value;
+ super.strand = value;
+
+ // The content area will hold the views
+ _contentArea = new ManagedContentArea();
+
var model:ViewManagerModel = value.getBeadByType(IBeadModel) as ViewManagerModel;
if (model.toolBarItems)
{
- _toolBar = new ToolBar();
- _toolBar.controls = model.toolBarItems;
- _toolBar.addBead(new HorizontalLayout());
- UIBase(value).addElement(_toolBar,false);
+ var tbar:ToolBar = new ToolBar();
+ tbar.controls = model.toolBarItems;
+ tbar.addBead(new HorizontalLayout());
+ toolBar = tbar;
}
-
- super.strand = value;
- }
- override public function get strand():IStrand
- {
- return super.strand;
}
- /**
- * @private
- */
- override protected function layoutChromeElements():void
- {
- var host:UIBase = strand as UIBase;
- var contentAreaY:Number = 0;
- var contentAreaHeight:Number = host.height;
- var toolbarHeight:Number = _toolBar == null ? 0 : _toolBar.height;
-
- var model:ViewManagerModel = strand.getBeadByType(IBeadModel) as ViewManagerModel;
+ override protected function handleInitComplete(event:Event):void
+ {
+ super.handleInitComplete(event);
- if (navigationBar)
- {
- navigationBar.x = 0;
- navigationBar.y = 0;
- navigationBar.width = host.width;
-
- contentAreaHeight -= navigationBar.height;
- contentAreaY = navigationBar.height;
-
- model.navigationBar = navigationBar;
+ COMPILE::SWF {
+ _contentArea.percentWidth = 100;
+ _contentArea.percentHeight = 100;
}
+ UIBase(_strand).addElement(_contentArea);
- if (_toolBar)
- {
- _toolBar.x = 0;
- _toolBar.y = host.height - toolbarHeight;
- _toolBar.width = host.width;
-
- contentAreaHeight -= toolbarHeight;
-
- model.toolBar = _toolBar;
+ if (toolBar) {
+ UIBase(_strand).addElement(toolBar);
}
- if (contentAreaY < 0) contentAreaY = 0;
- if (contentAreaHeight < 0) contentAreaHeight = 0;
+ performLayout(event);
- model.contentX = 0;
- model.contentY = contentAreaY;
- model.contentWidth = host.width;
- model.contentHeight = contentAreaHeight;
+ showViewByIndex(0);
+ }
+
+ private var _topView:IViewManagerView;
+
+ protected function showViewByIndex(index:int):void
+ {
+ var model:ViewManagerModel = _strand.getBeadByType(IBeadModel) as ViewManagerModel;
- sizeViewsToFitContentArea();
+ if (_topView != null) {
+ contentArea.removeElement(_topView);
+ }
+ _topView = model.views[index] as IViewManagerView;
+ contentArea.addElement(_topView);
- // notify the views that the content size has changed
- IEventDispatcher(strand).dispatchEvent( new Event("contentSizeChanged") );
+ COMPILE::JS {
+ if (_topView) {
+ UIBase(_topView).element.style["flex-grow"] = "1";
+ }
+ }
}
+
+ override protected function layoutViewAfterContentLayout():void
+ {
+ super.layoutViewAfterContentLayout();
+
+ COMPILE::SWF {
+ if (_topView) {
+ UIBase(_topView).width = contentArea.width;
+ UIBase(_topView).height = contentArea.height;
+ }
+ }
+ }
+
+ /**
+ * @private
+ */
+// override protected function layoutChromeElements():void
+// {
+// var host:UIBase = strand as UIBase;
+// var contentAreaY:Number = 0;
+// var contentAreaHeight:Number = host.height;
+// var toolbarHeight:Number = _toolBar == null ? 0 : _toolBar.height;
+//
+// var model:ViewManagerModel = strand.getBeadByType(IBeadModel) as ViewManagerModel;
+//
+// if (navigationBar)
+// {
+// navigationBar.x = 0;
+// navigationBar.y = 0;
+// navigationBar.width = host.width;
+//
+// contentAreaHeight -= navigationBar.height;
+// contentAreaY = navigationBar.height;
+//
+// model.navigationBar = navigationBar;
+// }
+//
+// if (_toolBar)
+// {
+// _toolBar.x = 0;
+// _toolBar.y = host.height - toolbarHeight;
+// _toolBar.width = host.width;
+//
+// contentAreaHeight -= toolbarHeight;
+//
+// model.toolBar = _toolBar;
+// }
+//
+// if (contentAreaY < 0) contentAreaY = 0;
+// if (contentAreaHeight < 0) contentAreaHeight = 0;
+//
+// model.contentX = 0;
+// model.contentY = contentAreaY;
+// model.contentWidth = host.width;
+// model.contentHeight = contentAreaHeight;
+//
+// sizeViewsToFitContentArea();
+//
+// // notify the views that the content size has changed
+// IEventDispatcher(strand).dispatchEvent( new Event("contentSizeChanged") );
+// }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e0b3528a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/TabbedViewManagerView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/TabbedViewManagerView.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/TabbedViewManagerView.as
index 787375d..227ae74 100644
--- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/TabbedViewManagerView.as
+++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/TabbedViewManagerView.as
@@ -26,9 +26,12 @@ package org.apache.flex.mobile.beads
import org.apache.flex.events.Event;
import org.apache.flex.html.beads.ContainerView;
import org.apache.flex.html.beads.layouts.HorizontalLayout;
+ import org.apache.flex.mobile.IViewManagerView;
+ import org.apache.flex.mobile.ManagedContentArea;
import org.apache.flex.mobile.chrome.NavigationBar;
import org.apache.flex.mobile.chrome.TabBar;
import org.apache.flex.mobile.models.ViewManagerModel;
+ import org.apache.flex.mobile.beads.TabbedViewManagerView;
/**
* The TabbedViewManagerView constructs the visual elements of the TabbedViewManager. The
@@ -54,9 +57,25 @@ package org.apache.flex.mobile.beads
super();
}
- private var _tabBar:TabBar;
-
private var _strand:IStrand;
+ private var _contentArea:ManagedContentArea;
+
+ public function get tabBar():TabBar
+ {
+ var model:ViewManagerModel = strand.getBeadByType(IBeadModel) as ViewManagerModel;
+ return model.tabBar;
+ }
+ public function set tabBar(value:TabBar):void
+ {
+ var model:ViewManagerModel = strand.getBeadByType(IBeadModel) as ViewManagerModel;
+ model.tabBar = value;
+ }
+
+ public function get contentArea():ManagedContentArea
+ {
+ return _contentArea;
+ }
+
override public function get strand():IStrand
{
return _strand;
@@ -64,17 +83,69 @@ package org.apache.flex.mobile.beads
override public function set strand(value:IStrand):void
{
_strand = value;
+ super.strand = value;
+
+ // The content area will hold the views
+ _contentArea = new ManagedContentArea();
var model:ViewManagerModel = value.getBeadByType(IBeadModel) as ViewManagerModel;
// TabbedViewManager always has a TabBar
- _tabBar = new TabBar();
- _tabBar.dataProvider = model.views;
- _tabBar.labelField = "title";
- _tabBar.addEventListener("change",handleButtonBarChange);
- UIBase(_strand).addElement(_tabBar, false);
+ var tbar:TabBar = new TabBar();
+ tbar.dataProvider = model.views;
+ tbar.labelField = "title";
+ tbar.addEventListener("change",handleButtonBarChange);
+ tabBar = tbar;
+ }
+
+ override protected function handleInitComplete(event:Event):void
+ {
+ super.handleInitComplete(event);
- super.strand = value;
+ COMPILE::SWF {
+ _contentArea.percentWidth = 100;
+ _contentArea.percentHeight = 100;
+ }
+ UIBase(_strand).addElement(_contentArea);
+
+ if (tabBar) {
+ UIBase(_strand).addElement(tabBar);
+ }
+
+ performLayout(event);
+
+ showViewByIndex(0);
+ }
+
+ private var _currentView:IViewManagerView;
+
+ protected function showViewByIndex(index:int):void
+ {
+ var model:ViewManagerModel = _strand.getBeadByType(IBeadModel) as ViewManagerModel;
+
+ if (_currentView != null) {
+ contentArea.removeElement(_currentView);
+ }
+ _currentView = model.views[index] as IViewManagerView;
+ contentArea.addElement(_currentView);
+
+ COMPILE::JS {
+ if (_currentView) {
+ UIBase(_currentView).element.style["flex-grow"] = "1";
+ }
+ }
+ }
+
+ override protected function layoutViewAfterContentLayout():void
+ {
+ super.layoutViewAfterContentLayout();
+
+ COMPILE::SWF {
+ if (_currentView) {
+ UIBase(_currentView).width = contentArea.width;
+ UIBase(_currentView).height = contentArea.height;
+ }
+ }
}
/**
@@ -82,58 +153,60 @@ package org.apache.flex.mobile.beads
*/
private function handleButtonBarChange(event:Event):void
{
- var newIndex:Number = _tabBar.selectedIndex;
+ var newIndex:Number = tabBar.selectedIndex;
var model:ViewManagerModel = strand.getBeadByType(IBeadModel) as ViewManagerModel;
// doing this will trigger the selectedIndexChanged event which will
// tell the strand to switch views
model.selectedIndex = newIndex;
+
+ showViewByIndex(newIndex);
}
/**
* @private
*/
- override protected function layoutChromeElements():void
- {
- var host:UIBase = _strand as UIBase;
- var contentAreaY:Number = 0;
- var contentAreaHeight:Number = host.height;
-
- var model:ViewManagerModel = strand.getBeadByType(IBeadModel) as ViewManagerModel;
-
- if (navigationBar)
- {
- navigationBar.x = 0;
- navigationBar.y = 0;
- navigationBar.width = host.width;
-
- contentAreaHeight -= navigationBar.height;
- contentAreaY = navigationBar.height;
-
- model.navigationBar = navigationBar;
- }
-
- if (_tabBar)
- {
- _tabBar.x = 0;
- _tabBar.y = host.height - _tabBar.height;
- _tabBar.width = host.width;
- _tabBar.dispatchEvent(new Event("layoutNeeded"));
-
- contentAreaHeight -= _tabBar.height;
-
- model.tabBar = _tabBar;
- }
-
- model.contentX = 0;
- model.contentY = contentAreaY;
- model.contentWidth = host.width;
- model.contentHeight = contentAreaHeight;
-
- sizeViewsToFitContentArea();
-
- // notify the views that the content size has changed
- IEventDispatcher(strand).dispatchEvent( new Event("contentSizeChanged") );
- }
+// override protected function layoutChromeElements():void
+// {
+// var host:UIBase = _strand as UIBase;
+// var contentAreaY:Number = 0;
+// var contentAreaHeight:Number = host.height;
+//
+// var model:ViewManagerModel = strand.getBeadByType(IBeadModel) as ViewManagerModel;
+//
+// if (navigationBar)
+// {
+// navigationBar.x = 0;
+// navigationBar.y = 0;
+// navigationBar.width = host.width;
+//
+// contentAreaHeight -= navigationBar.height;
+// contentAreaY = navigationBar.height;
+//
+// model.navigationBar = navigationBar;
+// }
+//
+// if (_tabBar)
+// {
+// _tabBar.x = 0;
+// _tabBar.y = host.height - _tabBar.height;
+// _tabBar.width = host.width;
+// _tabBar.dispatchEvent(new Event("layoutNeeded"));
+//
+// contentAreaHeight -= _tabBar.height;
+//
+// model.tabBar = _tabBar;
+// }
+//
+// model.contentX = 0;
+// model.contentY = contentAreaY;
+// model.contentWidth = host.width;
+// model.contentHeight = contentAreaHeight;
+//
+// sizeViewsToFitContentArea();
+//
+// // notify the views that the content size has changed
+// IEventDispatcher(strand).dispatchEvent( new Event("contentSizeChanged") );
+// }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e0b3528a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/ViewManagerViewBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/ViewManagerViewBase.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/ViewManagerViewBase.as
index f314fad..5599ad9 100644
--- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/ViewManagerViewBase.as
+++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/ViewManagerViewBase.as
@@ -28,6 +28,7 @@ package org.apache.flex.mobile.beads
import org.apache.flex.events.Event;
import org.apache.flex.html.Container;
import org.apache.flex.html.beads.layouts.HorizontalLayout;
+ import org.apache.flex.html.beads.GroupView;
import org.apache.flex.mobile.IViewManagerView;
import org.apache.flex.mobile.chrome.NavigationBar;
import org.apache.flex.mobile.models.ViewManagerModel;
@@ -41,7 +42,7 @@ package org.apache.flex.mobile.beads
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class ViewManagerViewBase implements IBeadView
+ public class ViewManagerViewBase extends GroupView implements IBeadView
{
/**
* Constructor.
@@ -56,23 +57,15 @@ package org.apache.flex.mobile.beads
super();
}
- public function get host():IUIBase
- {
- return _strand as IUIBase;
- }
- public function set host(value:IUIBase):void
- {
- // not implemented; getter only.
- }
-
- private var _navigationBar:NavigationBar;
public function get navigationBar():NavigationBar
{
- return _navigationBar;
+ var model:ViewManagerModel = strand.getBeadByType(IBeadModel) as ViewManagerModel;
+ return model.navigationBar;
}
public function set navigationBar(value:NavigationBar):void
{
- // not implemented; getter only.
+ var model:ViewManagerModel = strand.getBeadByType(IBeadModel) as ViewManagerModel;
+ model.navigationBar = value;
}
private var _strand:IStrand;
@@ -80,22 +73,29 @@ package org.apache.flex.mobile.beads
{
return _strand;
}
- public function set strand(value:IStrand):void
+ override public function set strand(value:IStrand):void
{
+ super.strand = value;
_strand = value;
- UIBase(_strand).addEventListener("sizeChanged", sizeChangedHandler);
- UIBase(_strand).addEventListener("widthChanged", sizeChangedHandler);
- UIBase(_strand).addEventListener("heightChanged", sizeChangedHandler);
var model:ViewManagerModel = value.getBeadByType(IBeadModel) as ViewManagerModel;
model.addEventListener("selectedIndexChanged", viewsChangedHandler);
if (model.navigationBarItems)
{
- _navigationBar = new NavigationBar();
- _navigationBar.controls = model.navigationBarItems;
- _navigationBar.addBead(new HorizontalLayout());
- UIBase(_strand).addElement(_navigationBar, false);
+ var navBar:NavigationBar = new NavigationBar();
+ navBar.controls = model.navigationBarItems;
+ navBar.addBead(new HorizontalLayout());
+ navigationBar = navBar;
+ }
+ }
+
+ override protected function handleInitComplete(event:Event):void
+ {
+ super.handleInitComplete(event);
+
+ if (navigationBar) {
+ UIBase(_strand).addElement(navigationBar);
}
}
@@ -110,56 +110,57 @@ package org.apache.flex.mobile.beads
/**
* @private
*/
- protected function sizeChangedHandler(event:Event):void
- {
- layoutChromeElements();
- }
+// protected function sizeChangedHandler(event:Event):void
+// {
+// layoutChromeElements();
+// }
/**
* @private
*/
protected function layoutChromeElements():void
{
- var host:UIBase = _strand as UIBase;
- var contentAreaY:Number = 0;
- var contentAreaHeight:Number = host.height;
-
- var model:ViewManagerModel = _strand.getBeadByType(IBeadModel) as ViewManagerModel;
-
- if (_navigationBar)
- {
- _navigationBar.x = 0;
- _navigationBar.y = 0;
- _navigationBar.width = host.width;
-
- contentAreaHeight -= _navigationBar.height;
- contentAreaY = _navigationBar.height;
-
- model.navigationBar = _navigationBar;
- }
-
- model.contentX = 0;
- model.contentY = contentAreaY;
- model.contentWidth = host.width;
- model.contentHeight = contentAreaHeight;
-
- sizeViewsToFitContentArea();
+ performLayout(null);
+// var host:UIBase = _strand as UIBase;
+// var contentAreaY:Number = 0;
+// var contentAreaHeight:Number = host.height;
+//
+// var model:ViewManagerModel = _strand.getBeadByType(IBeadModel) as ViewManagerModel;
+//
+// if (_navigationBar)
+// {
+// _navigationBar.x = 0;
+// _navigationBar.y = 0;
+// _navigationBar.width = host.width;
+//
+// contentAreaHeight -= _navigationBar.height;
+// contentAreaY = _navigationBar.height;
+//
+// model.navigationBar = _navigationBar;
+// }
+//
+// model.contentX = 0;
+// model.contentY = contentAreaY;
+// model.contentWidth = host.width;
+// model.contentHeight = contentAreaHeight;
+//
+// sizeViewsToFitContentArea();
}
protected function sizeViewsToFitContentArea():void
{
- var model:ViewManagerModel = _strand.getBeadByType(IBeadModel) as ViewManagerModel;
-
- var n:int = ViewManagerModel(model).views.length;
- if (n > 0) {
- for (var i:int = 0; i < n; i++)
- {
- var view:IViewManagerView = ViewManagerModel(model).views[i] as IViewManagerView;
- UIBase(view).x = model.contentX;
- UIBase(view).y = model.contentY;
- UIBase(view).setWidthAndHeight(model.contentWidth, model.contentHeight, true);
- }
- }
+// var model:ViewManagerModel = _strand.getBeadByType(IBeadModel) as ViewManagerModel;
+//
+// var n:int = ViewManagerModel(model).views.length;
+// if (n > 0) {
+// for (var i:int = 0; i < n; i++)
+// {
+// var view:IViewManagerView = ViewManagerModel(model).views[i] as IViewManagerView;
+// UIBase(view).x = model.contentX;
+// UIBase(view).y = model.contentY;
+// UIBase(view).setWidthAndHeight(model.contentWidth, model.contentHeight, true);
+// }
+// }
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e0b3528a/frameworks/projects/Mobile/src/main/resources/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/resources/basic-manifest.xml b/frameworks/projects/Mobile/src/main/resources/basic-manifest.xml
index e0f523d..ac85e14 100644
--- a/frameworks/projects/Mobile/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Mobile/src/main/resources/basic-manifest.xml
@@ -23,6 +23,7 @@
<component id="StackedViewManager" class="org.apache.flex.mobile.StackedViewManager" />
<component id="TabbedViewManager" class="org.apache.flex.mobile.TabbedViewManager" />
<component id="TitleView" class="org.apache.flex.mobile.TitleView" />
+ <component id="ManagedContentArea" class="org.apache.flex.mobile.ManagedContentArea" />
<component id="NavigationBar" class="org.apache.flex.mobile.chrome.NavigationBar" />
<component id="ToolBar" class="org.apache.flex.mobile.chrome.ToolBar" />
<component id="TabBar" class="org.apache.flex.mobile.chrome.TabBar" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e0b3528a/frameworks/projects/Mobile/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/resources/defaults.css b/frameworks/projects/Mobile/src/main/resources/defaults.css
index ddf9229..405a3a5 100644
--- a/frameworks/projects/Mobile/src/main/resources/defaults.css
+++ b/frameworks/projects/Mobile/src/main/resources/defaults.css
@@ -20,16 +20,29 @@
@namespace "library://ns.apache.org/flexjs/basic";
@namespace svg "library://ns.apache.org/flexjs/svg";
+NavigationBar
+{
+ IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.HorizontalFlexLayout");
+}
+
StackedViewManager
{
IBeadModel: ClassReference("org.apache.flex.mobile.models.ViewManagerModel");
IBeadView: ClassReference("org.apache.flex.mobile.beads.StackedViewManagerView");
+ IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VerticalFlexLayout");
}
TabbedViewManager
{
IBeadModel: ClassReference("org.apache.flex.mobile.models.ViewManagerModel");
IBeadView: ClassReference("org.apache.flex.mobile.beads.TabbedViewManagerView");
+ IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VerticalFlexLayout");
+}
+
+ManagedContentArea
+{
+ display: flex;
+ flex-grow: 1;
}
ToggleSwitch
@@ -63,3 +76,11 @@ DatePicker {
IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModelExtended");
IBeadController: ClassReference("org.apache.flex.html.beads.controllers.RangeStepperMouseController");
}
+
+@media -flex-flash
+{
+ NavigationBar {
+ IBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+ IBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+ }
+}
[4/8] git commit: [flex-asjs] [refs/heads/develop] - Sync Effects
with layout changes.
Posted by pe...@apache.org.
Sync Effects with layout changes.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d89a0109
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d89a0109
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d89a0109
Branch: refs/heads/develop
Commit: d89a0109de12e7ae04acd05f9c94e23686a06565
Parents: 0fc2115
Author: Peter Ent <pe...@apache.org>
Authored: Thu Apr 13 11:44:25 2017 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Thu Apr 13 11:44:25 2017 -0400
----------------------------------------------------------------------
.../src/main/flex/org/apache/flex/utils/MockLayoutHost.as | 10 ++++++++++
.../main/flex/org/apache/flex/utils/MockLayoutParent.as | 10 ++++++++++
2 files changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d89a0109/frameworks/projects/Effects/src/main/flex/org/apache/flex/utils/MockLayoutHost.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/src/main/flex/org/apache/flex/utils/MockLayoutHost.as b/frameworks/projects/Effects/src/main/flex/org/apache/flex/utils/MockLayoutHost.as
index b7aaf8f..4b32bc9 100644
--- a/frameworks/projects/Effects/src/main/flex/org/apache/flex/utils/MockLayoutHost.as
+++ b/frameworks/projects/Effects/src/main/flex/org/apache/flex/utils/MockLayoutHost.as
@@ -33,5 +33,15 @@ package org.apache.flex.utils
{
return _contentView;
}
+
+ public function beforeLayout():void
+ {
+
+ }
+
+ public function afterLayout():void
+ {
+
+ }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d89a0109/frameworks/projects/Effects/src/main/flex/org/apache/flex/utils/MockLayoutParent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/src/main/flex/org/apache/flex/utils/MockLayoutParent.as b/frameworks/projects/Effects/src/main/flex/org/apache/flex/utils/MockLayoutParent.as
index fe39f96..1da2b5a 100644
--- a/frameworks/projects/Effects/src/main/flex/org/apache/flex/utils/MockLayoutParent.as
+++ b/frameworks/projects/Effects/src/main/flex/org/apache/flex/utils/MockLayoutParent.as
@@ -48,6 +48,16 @@ package org.apache.flex.utils
_layoutHost = new MockLayoutHost(source.getLayoutHost());
_source = source;
}
+
+ public function beforeLayout():void
+ {
+ // TODO ??
+ }
+
+ public function afterLayout():void
+ {
+ // TODO ??
+ }
public function get parent():IParent
{
[5/8] git commit: [flex-asjs] [refs/heads/develop] - Merge branch
'feature/mobile' into feature/layouts
Posted by pe...@apache.org.
Merge branch 'feature/mobile' into feature/layouts
* feature/mobile:
Initial changes for Mobile project.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6256851b
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6256851b
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6256851b
Branch: refs/heads/develop
Commit: 6256851b9522427ec35f78ffb110dab53faf168b
Parents: d89a010 e0b3528
Author: Peter Ent <pe...@apache.org>
Authored: Thu Apr 13 14:31:01 2017 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Thu Apr 13 14:31:01 2017 -0400
----------------------------------------------------------------------
.../ButtonBarButtonItemRenderer.as | 34 +++-
.../Mobile/src/main/flex/MobileClasses.as | 1 +
.../apache/flex/mobile/ManagedContentArea.as | 55 ++++++
.../apache/flex/mobile/StackedViewManager.as | 51 ++++--
.../org/apache/flex/mobile/TabbedViewManager.as | 42 +++++
.../flex/org/apache/flex/mobile/TitleView.as | 4 -
.../org/apache/flex/mobile/ViewManagerBase.as | 52 ++----
.../flex/mobile/beads/StackedViewManagerView.as | 175 +++++++++++++------
.../flex/mobile/beads/TabbedViewManagerView.as | 175 +++++++++++++------
.../flex/mobile/beads/ViewManagerViewBase.as | 123 ++++++-------
.../src/main/resources/basic-manifest.xml | 1 +
.../Mobile/src/main/resources/defaults.css | 21 +++
12 files changed, 511 insertions(+), 223 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6256851b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.as
----------------------------------------------------------------------
[6/8] git commit: [flex-asjs] [refs/heads/develop] - Mobile framework
changes.
Posted by pe...@apache.org.
Mobile framework changes.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fd5eaae5
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fd5eaae5
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fd5eaae5
Branch: refs/heads/develop
Commit: fd5eaae541f5740d80bcf77aaa657c4eeb59a07a
Parents: 6256851
Author: Peter Ent <pe...@apache.org>
Authored: Fri Apr 14 08:53:04 2017 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Fri Apr 14 08:53:04 2017 -0400
----------------------------------------------------------------------
.../apache/flex/mobile/StackedViewManager.as | 30 +-----
.../org/apache/flex/mobile/TabbedViewManager.as | 32 ------
.../org/apache/flex/mobile/ViewManagerBase.as | 4 -
.../flex/mobile/beads/StackedViewManagerView.as | 105 +++++++++----------
.../flex/mobile/beads/TabbedViewManagerView.as | 69 ++++--------
.../flex/mobile/beads/ViewManagerViewBase.as | 18 +++-
.../Mobile/src/main/resources/defaults.css | 16 +++
7 files changed, 100 insertions(+), 174 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd5eaae5/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/StackedViewManager.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/StackedViewManager.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/StackedViewManager.as
index 79368fd..8f1eeea 100644
--- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/StackedViewManager.as
+++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/StackedViewManager.as
@@ -135,14 +135,6 @@ package org.apache.flex.mobile
override public function addedToParent():void
{
super.addedToParent();
-
-// var tabbedView:StackedViewManagerView = getBeadByType(StackedViewManagerView) as StackedViewManagerView;
-//
-// var n:int = ViewManagerModel(model).views.length;
-// if (n > 0) {
-// var view:IViewManagerView = ViewManagerModel(model).views[0] as IViewManagerView;
-// push(view);
-// }
}
@@ -158,16 +150,6 @@ package org.apache.flex.mobile
{
nextView.viewManager = this;
ViewManagerModel(model).pushView(nextView);
-
-// var stackedView:StackedViewManagerView = getBeadByType(StackedViewManagerView) as StackedViewManagerView;
-//
-// if (_topView != null) {
-// stackedView.contentArea.removeElement(_topView);
-// }
-// _topView = nextView;
-// stackedView.contentArea.addElement(_topView);
-//
-// dispatchEvent( new Event("viewChanged") );
}
/**
@@ -178,18 +160,10 @@ package org.apache.flex.mobile
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function pop():void
+ public function pop():IChild
{
var stackedView:StackedViewManagerView = getBeadByType(StackedViewManagerView) as StackedViewManagerView;
-
-// if (ViewManagerModel(model).views.length > 1) {
-// var lastView:IChild = ViewManagerModel(model).popView() as IChild;
-// stackedView.contentArea.removeElement(_topView);
-// stackedView.contentArea.addElement(lastView);
-// _topView = lastView as IViewManagerView;
-//
-// dispatchEvent( new Event("viewChanged") );
-// }
+ return ViewManagerModel(model).popView();
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd5eaae5/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TabbedViewManager.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TabbedViewManager.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TabbedViewManager.as
index 3b0d89d..5a895d5 100644
--- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TabbedViewManager.as
+++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TabbedViewManager.as
@@ -91,38 +91,6 @@ package org.apache.flex.mobile
override public function addedToParent():void
{
super.addedToParent();
-
-// var tabbedView:TabbedViewManagerView = getBeadByType(TabbedViewManagerView) as TabbedViewManagerView;
-//
-// var n:int = ViewManagerModel(model).views.length;
-// if (n > 0) {
-// for (var i:int = 0; i < n; i++)
-// {
-// var view:IViewManagerView = ViewManagerModel(model).views[i] as IViewManagerView;
-// view.viewManager = this;
-// if (i == 0) {
-// tabbedView.contentArea.addElement(view, true);
-// }
-// }
-// ViewManagerModel(model).selectedIndex = 0;
-// }
- }
-
- /**
- * @private
- */
- override protected function changeView( event:Event ):void
- {
-// var tabbedView:TabbedViewManagerView = getBeadByType(TabbedViewManagerView) as TabbedViewManagerView;
-//
-// var index:Number = ViewManagerModel(model).selectedIndex;
-// if (currentView) {
-// tabbedView.contentArea.removeElement(currentView);
-// }
-// currentView = views[index];
-// tabbedView.contentArea.addElement(currentView);
-//
-// dispatchEvent( new Event("viewChanged") );
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd5eaae5/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ViewManagerBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ViewManagerBase.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ViewManagerBase.as
index cc16ae3..549891d 100644
--- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ViewManagerBase.as
+++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ViewManagerBase.as
@@ -53,10 +53,6 @@ package org.apache.flex.mobile
{
super();
- // views always fill their space
- percentWidth = 100;
- percentHeight = 100;
-
model.addEventListener("selectedIndexChanged", changeView);
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd5eaae5/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/StackedViewManagerView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/StackedViewManagerView.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/StackedViewManagerView.as
index bd99b00..2e4e009 100644
--- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/StackedViewManagerView.as
+++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/StackedViewManagerView.as
@@ -26,6 +26,7 @@ package org.apache.flex.mobile.beads
import org.apache.flex.events.Event;
import org.apache.flex.html.beads.ContainerView;
import org.apache.flex.html.beads.layouts.HorizontalLayout;
+ import org.apache.flex.mobile.IViewManager;
import org.apache.flex.mobile.IViewManagerView;
import org.apache.flex.mobile.ManagedContentArea;
import org.apache.flex.mobile.chrome.NavigationBar;
@@ -57,6 +58,11 @@ package org.apache.flex.mobile.beads
}
private var _strand:IStrand;
+
+ /*
+ * Children
+ */
+
private var _contentArea:ManagedContentArea;
public function get contentArea():ManagedContentArea
@@ -75,6 +81,10 @@ package org.apache.flex.mobile.beads
model.toolBar = value;
}
+ /*
+ * ViewBead
+ */
+
override public function get strand():IStrand
{
return _strand;
@@ -102,9 +112,12 @@ package org.apache.flex.mobile.beads
{
super.handleInitComplete(event);
+ var model:ViewManagerModel = _strand.getBeadByType(IBeadModel) as ViewManagerModel;
+ IEventDispatcher(model).addEventListener("viewPushed", handlePushEvent);
+ IEventDispatcher(model).addEventListener("viewPopped", handlePopEvent);
+
COMPILE::SWF {
_contentArea.percentWidth = 100;
- _contentArea.percentHeight = 100;
}
UIBase(_strand).addElement(_contentArea);
@@ -112,13 +125,40 @@ package org.apache.flex.mobile.beads
UIBase(_strand).addElement(toolBar);
}
- performLayout(event);
-
showViewByIndex(0);
}
private var _topView:IViewManagerView;
+ private function handlePushEvent(event:Event):void
+ {
+ var model:ViewManagerModel = _strand.getBeadByType(IBeadModel) as ViewManagerModel;
+ var n:int = model.views.length;
+ if (n > 0) {
+ showViewByIndex(n-1);
+ }
+ }
+
+ private function handlePopEvent(event:Event):void
+ {
+ var model:ViewManagerModel = _strand.getBeadByType(IBeadModel) as ViewManagerModel;
+ var n:int = model.views.length;
+ if (n > 0) {
+ showViewByIndex(n-1);
+ }
+ }
+
+ public function showView(view:IViewManagerView):void
+ {
+ var model:ViewManagerModel = _strand.getBeadByType(IBeadModel) as ViewManagerModel;
+ for(var i:int=0; i < model.views.length; i++) {
+ if (view == model.views[i]) {
+ showViewByIndex(i);
+ break;
+ }
+ }
+ }
+
protected function showViewByIndex(index:int):void
{
var model:ViewManagerModel = _strand.getBeadByType(IBeadModel) as ViewManagerModel;
@@ -127,6 +167,7 @@ package org.apache.flex.mobile.beads
contentArea.removeElement(_topView);
}
_topView = model.views[index] as IViewManagerView;
+ _topView.viewManager = _strand as IViewManager;
contentArea.addElement(_topView);
COMPILE::JS {
@@ -134,11 +175,16 @@ package org.apache.flex.mobile.beads
UIBase(_topView).element.style["flex-grow"] = "1";
}
}
+ COMPILE::SWF {
+ UIBase(_topView).percentWidth = 100;
+ UIBase(_topView).percentHeight = 100;
+ contentArea.layoutNeeded();
+ }
}
- override protected function layoutViewAfterContentLayout():void
+ override public function afterLayout():void
{
- super.layoutViewAfterContentLayout();
+ super.afterLayout();
COMPILE::SWF {
if (_topView) {
@@ -147,54 +193,5 @@ package org.apache.flex.mobile.beads
}
}
}
-
- /**
- * @private
- */
-// override protected function layoutChromeElements():void
-// {
-// var host:UIBase = strand as UIBase;
-// var contentAreaY:Number = 0;
-// var contentAreaHeight:Number = host.height;
-// var toolbarHeight:Number = _toolBar == null ? 0 : _toolBar.height;
-//
-// var model:ViewManagerModel = strand.getBeadByType(IBeadModel) as ViewManagerModel;
-//
-// if (navigationBar)
-// {
-// navigationBar.x = 0;
-// navigationBar.y = 0;
-// navigationBar.width = host.width;
-//
-// contentAreaHeight -= navigationBar.height;
-// contentAreaY = navigationBar.height;
-//
-// model.navigationBar = navigationBar;
-// }
-//
-// if (_toolBar)
-// {
-// _toolBar.x = 0;
-// _toolBar.y = host.height - toolbarHeight;
-// _toolBar.width = host.width;
-//
-// contentAreaHeight -= toolbarHeight;
-//
-// model.toolBar = _toolBar;
-// }
-//
-// if (contentAreaY < 0) contentAreaY = 0;
-// if (contentAreaHeight < 0) contentAreaHeight = 0;
-//
-// model.contentX = 0;
-// model.contentY = contentAreaY;
-// model.contentWidth = host.width;
-// model.contentHeight = contentAreaHeight;
-//
-// sizeViewsToFitContentArea();
-//
-// // notify the views that the content size has changed
-// IEventDispatcher(strand).dispatchEvent( new Event("contentSizeChanged") );
-// }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd5eaae5/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/TabbedViewManagerView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/TabbedViewManagerView.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/TabbedViewManagerView.as
index 227ae74..7959da0 100644
--- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/TabbedViewManagerView.as
+++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/TabbedViewManagerView.as
@@ -26,6 +26,7 @@ package org.apache.flex.mobile.beads
import org.apache.flex.events.Event;
import org.apache.flex.html.beads.ContainerView;
import org.apache.flex.html.beads.layouts.HorizontalLayout;
+ import org.apache.flex.mobile.IViewManager;
import org.apache.flex.mobile.IViewManagerView;
import org.apache.flex.mobile.ManagedContentArea;
import org.apache.flex.mobile.chrome.NavigationBar;
@@ -58,6 +59,11 @@ package org.apache.flex.mobile.beads
}
private var _strand:IStrand;
+
+ /*
+ * Children
+ */
+
private var _contentArea:ManagedContentArea;
public function get tabBar():TabBar
@@ -76,6 +82,10 @@ package org.apache.flex.mobile.beads
return _contentArea;
}
+ /*
+ * ViewBead
+ */
+
override public function get strand():IStrand
{
return _strand;
@@ -104,7 +114,6 @@ package org.apache.flex.mobile.beads
COMPILE::SWF {
_contentArea.percentWidth = 100;
- _contentArea.percentHeight = 100;
}
UIBase(_strand).addElement(_contentArea);
@@ -112,8 +121,6 @@ package org.apache.flex.mobile.beads
UIBase(_strand).addElement(tabBar);
}
- performLayout(event);
-
showViewByIndex(0);
}
@@ -127,6 +134,7 @@ package org.apache.flex.mobile.beads
contentArea.removeElement(_currentView);
}
_currentView = model.views[index] as IViewManagerView;
+ _currentView.viewManager = _strand as IViewManager;
contentArea.addElement(_currentView);
COMPILE::JS {
@@ -134,11 +142,16 @@ package org.apache.flex.mobile.beads
UIBase(_currentView).element.style["flex-grow"] = "1";
}
}
+ COMPILE::SWF {
+ UIBase(_currentView).percentWidth = 100;
+ UIBase(_currentView).percentHeight = 100;
+ contentArea.layoutNeeded();
+ }
}
- override protected function layoutViewAfterContentLayout():void
+ override public function afterLayout():void
{
- super.layoutViewAfterContentLayout();
+ super.afterLayout();
COMPILE::SWF {
if (_currentView) {
@@ -162,51 +175,5 @@ package org.apache.flex.mobile.beads
showViewByIndex(newIndex);
}
-
- /**
- * @private
- */
-// override protected function layoutChromeElements():void
-// {
-// var host:UIBase = _strand as UIBase;
-// var contentAreaY:Number = 0;
-// var contentAreaHeight:Number = host.height;
-//
-// var model:ViewManagerModel = strand.getBeadByType(IBeadModel) as ViewManagerModel;
-//
-// if (navigationBar)
-// {
-// navigationBar.x = 0;
-// navigationBar.y = 0;
-// navigationBar.width = host.width;
-//
-// contentAreaHeight -= navigationBar.height;
-// contentAreaY = navigationBar.height;
-//
-// model.navigationBar = navigationBar;
-// }
-//
-// if (_tabBar)
-// {
-// _tabBar.x = 0;
-// _tabBar.y = host.height - _tabBar.height;
-// _tabBar.width = host.width;
-// _tabBar.dispatchEvent(new Event("layoutNeeded"));
-//
-// contentAreaHeight -= _tabBar.height;
-//
-// model.tabBar = _tabBar;
-// }
-//
-// model.contentX = 0;
-// model.contentY = contentAreaY;
-// model.contentWidth = host.width;
-// model.contentHeight = contentAreaHeight;
-//
-// sizeViewsToFitContentArea();
-//
-// // notify the views that the content size has changed
-// IEventDispatcher(strand).dispatchEvent( new Event("contentSizeChanged") );
-// }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd5eaae5/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/ViewManagerViewBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/ViewManagerViewBase.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/ViewManagerViewBase.as
index 5599ad9..82337c4 100644
--- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/ViewManagerViewBase.as
+++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/ViewManagerViewBase.as
@@ -57,6 +57,10 @@ package org.apache.flex.mobile.beads
super();
}
+ /*
+ * Children
+ */
+
public function get navigationBar():NavigationBar
{
var model:ViewManagerModel = strand.getBeadByType(IBeadModel) as ViewManagerModel;
@@ -68,6 +72,10 @@ package org.apache.flex.mobile.beads
model.navigationBar = value;
}
+ /*
+ * ViewBead
+ */
+
private var _strand:IStrand;
public function get strand():IStrand
{
@@ -79,7 +87,7 @@ package org.apache.flex.mobile.beads
_strand = value;
var model:ViewManagerModel = value.getBeadByType(IBeadModel) as ViewManagerModel;
- model.addEventListener("selectedIndexChanged", viewsChangedHandler);
+// model.addEventListener("selectedIndexChanged", viewsChangedHandler);
if (model.navigationBarItems)
{
@@ -102,10 +110,10 @@ package org.apache.flex.mobile.beads
/**
* @private
*/
- protected function viewsChangedHandler(event:Event):void
- {
- layoutChromeElements();
- }
+// protected function viewsChangedHandler(event:Event):void
+// {
+// layoutChromeElements();
+// }
/**
* @private
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd5eaae5/frameworks/projects/Mobile/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/resources/defaults.css b/frameworks/projects/Mobile/src/main/resources/defaults.css
index 405a3a5..f360d5c 100644
--- a/frameworks/projects/Mobile/src/main/resources/defaults.css
+++ b/frameworks/projects/Mobile/src/main/resources/defaults.css
@@ -22,7 +22,10 @@
NavigationBar
{
+ height: 55px;
+ min-height: 55px;
IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.HorizontalFlexLayout");
+ flex-grow: 0;
}
StackedViewManager
@@ -43,6 +46,19 @@ ManagedContentArea
{
display: flex;
flex-grow: 1;
+ IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.BasicLayout");
+}
+
+TabBar {
+ flex-grow: 0;
+ height: 40px;
+ min-height: 40px;
+}
+
+ToolBar {
+ flex-grow: 0;
+ height: 40px;
+ min-height: 40px;
}
ToggleSwitch
[3/8] git commit: [flex-asjs] [refs/heads/develop] - Handles case
where Group et al may not have a layout.
Posted by pe...@apache.org.
Handles case where Group et al may not have a layout.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0fc2115c
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0fc2115c
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0fc2115c
Branch: refs/heads/develop
Commit: 0fc2115c4d4ca317f28ee4907dd179675cf590bb
Parents: 87efeed
Author: Peter Ent <pe...@apache.org>
Authored: Thu Apr 13 10:32:19 2017 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Thu Apr 13 10:32:19 2017 -0400
----------------------------------------------------------------------
.../HTML/src/main/flex/org/apache/flex/core/GroupBase.as | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0fc2115c/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/GroupBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/GroupBase.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/GroupBase.as
index 815101a..07859a1 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/GroupBase.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/GroupBase.as
@@ -109,8 +109,11 @@ package org.apache.flex.core
var layout:IBeadLayout = getBeadByType(IBeadLayout) as IBeadLayout;
if (!layout)
{
- layout = new (ValuesManager.valuesImpl.getValue(this, "iBeadLayout")) as IBeadLayout;
- addBead(layout);
+ var c:Class = ValuesManager.valuesImpl.getValue(this, "iBeadLayout") as Class;
+ if (c) {
+ layout = new c() as IBeadLayout;
+ addBead(layout);
+ }
}
}
[8/8] git commit: [flex-asjs] [refs/heads/develop] - MobileTrader now
displays; still is not completely operational.
Posted by pe...@apache.org.
MobileTrader now displays; still is not completely operational.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/5cb269d9
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/5cb269d9
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/5cb269d9
Branch: refs/heads/develop
Commit: 5cb269d973cfc5df1128dd35c6cad360b17bebc5
Parents: e3cbf4f
Author: Peter Ent <pe...@apache.org>
Authored: Fri Apr 14 16:47:08 2017 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Fri Apr 14 16:47:08 2017 -0400
----------------------------------------------------------------------
.../src/main/flex/MyInitialView.mxml | 131 ++++++++++++-------
.../src/main/flex/views/AlertsView.mxml | 23 ++--
.../src/main/flex/views/AssetsView.mxml | 21 ++-
.../src/main/flex/views/WatchListView.mxml | 24 ++--
.../flex/mobile/beads/StackedViewManagerView.as | 3 +-
.../flex/mobile/beads/TabbedViewManagerView.as | 2 +-
6 files changed, 124 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5cb269d9/examples/flexjs/MobileTrader/src/main/flex/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/src/main/flex/MyInitialView.mxml b/examples/flexjs/MobileTrader/src/main/flex/MyInitialView.mxml
index 103b358..70aea67 100755
--- a/examples/flexjs/MobileTrader/src/main/flex/MyInitialView.mxml
+++ b/examples/flexjs/MobileTrader/src/main/flex/MyInitialView.mxml
@@ -30,38 +30,28 @@ limitations under the License.
@namespace js "library://ns.apache.org/flexjs/basic";
@namespace views "views.*";
- js|Container {
- background-color: #FFFFFF;
- }
-
js|StackedViewManager {
- padding-top: 0px;
- padding-bottom: 0px;
- padding-left: 0px;
- padding-right: 0px;
+ background-color: #FFFFFF;
}
js|TabbedViewManager {
- position : absolute ;
- height : 100% ;
- width : 100% ;
- left : 0px ;
- top : 0px ;
- border: solid 1px #444444;
background-color: #FFFFFF;
}
.NavigationBar {
background-image: url("assets/background.png");
height: 55px;
+ min-height: 55px;
+ flex-grow: 0;
IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.HorizontalLayout");
}
.TabBar {
- background-color: #DEDEDE;
- height: 55px;
+ height: 40px;
vertical-align: middle;
- line-height: 55px;
+ line-height: 40px;
+ min-height: 40px;
+ flex-grow: 0;
}
.BackButton:hover {
@@ -76,53 +66,96 @@ limitations under the License.
background-image: url('assets/arrow_left_24.png');
}
+ /* Assets
+ */
+
+ views|AssetsView {
+ padding: 10px;
+ background-color: aliceblue;
+ }
+
.AssetsInner {
padding-top: 5px;
background-color: #FFFFFF;
}
- views|AssetsView {
- width: 100%;
- height: 100%;
+ .AssetsViewTitle {
+ flex-grow: 0;
+ height: 30px;
+ min-height: 30px;
+ }
+
+ .AssetsViewGrid {
+ flex-grow: 0;
+ min-height: 150px;
+ border: solid 1px #333333;
+ }
+
+ .AssetsViewGrid .midde .DataGridColumnList {
+ border-right: solid 1px #333333;
+ border-left: solid 1px #333333;
+ }
+
+ .AssetsViewChart {
+ flex-grow: 1;
}
+ /* WatchList
+ */
+
views|WatchListView {
- width: 100%;
- height: 100%;
+ padding: 10px;
+ background-color: aliceblue;
IBeadController:ClassReference('controller.WatchListController');
- background-color: #FFFFFF;
}
- .WatchListInner {
- height: 480px;
- width: 100%;
- background-color: #FFFFFF;
+ .WatchListInputArea {
+ flex-grow: 0;
+ height: 40px;
+ min-height: 40px;
}
.WatchListDataGrid {
- height: 480px;
- width: 100%;
+ flex-grow: 1;
+ backgroundColor: #FFFFFF;
+ border: solid 1px #333333;
}
- .WatchListInputArea {
- background-color: #FFFFFF;
- width: 480px;
- height: 25px;
- padding-top: 5px;
- padding-bottom: 2px;
+ .WatchListDataGrid .midde .DataGridColumnList {
+ border-right: solid 1px #333333;
+ border-left: solid 1px #333333;
}
- views|StockView {
- width: 100%;
- height: 100%;
- }
+ /* Alerts
+ */
views|AlertsView {
- width: 100%;
- height: 100%;
+ padding: 10px;
+ background-color: aliceblue;
IBeadController:ClassReference('controller.AlertsViewController');
}
+ .AlertsInput {
+ flex-grow: 0;
+ height: 40px;
+ min-height: 40px;
+ backgroundColor: aliceblue;
+ }
+
+ .AlertsDataGrid {
+ flex-grow: 1;
+ backgroundColor: #FFFFFF;
+ border: solid 1px #333333;
+ }
+
+ .AlertsDataGrid .midde .DataGridColumnList {
+ border-right: solid 1px #333333;
+ border-left: solid 1px #333333;
+ }
+
+ /* Supplements
+ */
+
.redCell {
color: #FF0000;
}
@@ -208,17 +241,17 @@ limitations under the License.
private function watchListStackChanged(event:org.apache.flex.events.Event):void
{
trace("watchlist stack changed");
- var manager:StackedViewManager = event.currentTarget as StackedViewManager;
-
- var currentView:IViewManagerView = manager.selectedView;
- backButton.visible = manager.views.length > 1;
+// var manager:StackedViewManager = event.currentTarget as StackedViewManager;
+//
+// var currentView:IViewManagerView = manager.selectedView;
+// backButton.visible = manager.views.length > 1;
}
private function goBack(event:org.apache.flex.events.MouseEvent):void
{
- if (navController.selectedIndex == 1) {
- watchListStack.pop();
- }
+// if (navController.selectedIndex == 1) {
+// watchListStack.pop();
+// }
}
]]>
</fx:Script>
@@ -227,7 +260,7 @@ limitations under the License.
<js:ViewDataBinding />
</js:beads>
- <js:TabbedViewManager id="navController" width="100%" height="100%" x="0" y="0" viewChanged="tabbedViewChanged(event)">
+ <js:TabbedViewManager id="navController" width="700" height="500" x="0" y="0" viewChanged="tabbedViewChanged(event)">
<js:navigationBarItems>
<js:TextButton id="backButton" width="45" height="45" className="BackButton" visible="false" click="goBack(event)">
<js:beads>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5cb269d9/examples/flexjs/MobileTrader/src/main/flex/views/AlertsView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/src/main/flex/views/AlertsView.mxml b/examples/flexjs/MobileTrader/src/main/flex/views/AlertsView.mxml
index f06dd65..71ddff6 100755
--- a/examples/flexjs/MobileTrader/src/main/flex/views/AlertsView.mxml
+++ b/examples/flexjs/MobileTrader/src/main/flex/views/AlertsView.mxml
@@ -21,7 +21,9 @@ limitations under the License.
title="Alerts"
xmlns:js="library://ns.apache.org/flexjs/basic"
xmlns:local="*"
- className="AlertsView" xmlns:renderers="renderers.*">
+ xmlns:controller="controller.*"
+ className="AlertsView"
+ xmlns:renderers="renderers.*">
<fx:Metadata>
[Event("next")]
@@ -51,8 +53,12 @@ limitations under the License.
}
]]>
</fx:Script>
+
+ <js:beads>
+ <js:VerticalFlexLayout />
+ </js:beads>
- <js:Container x="4" y="10" >
+ <js:Group x="4" y="10" width="100%" className="AlertsInput" >
<js:beads>
<js:HorizontalLayout />
</js:beads>
@@ -62,11 +68,12 @@ limitations under the License.
<js:TextInput id="valueField" width="50" />
<js:CheckBox text="Higher?" id="higherCheck" />
<js:TextButton text="Set" click="onAlertSet()" />
- </js:Container>
+ </js:Group>
- <js:DataGrid id="dataGrid" x="0" y="40" width="100%" height="200">
+ <js:DataGrid id="dataGrid" x="0" y="40" width="100%" className="AlertsDataGrid">
<js:beads>
- <js:DataProviderChangeNotifier sourceID="dataModel" propertyName="alerts" />
+ <js:DataGridPercentageView />
+ <!--<controller:DataModelChangeNotifier />-->
<js:SimpleBinding
eventName="alertsUpdate"
sourceID="dataModel"
@@ -74,21 +81,21 @@ limitations under the License.
destinationPropertyName="dataProvider" />
</js:beads>
<js:columns>
- <js:DataGridColumn label="Symbol" dataField="symbol">
+ <js:DataGridColumn label="Symbol" dataField="symbol" columnWidth="50">
<js:itemRenderer>
<fx:Component>
<js:StringItemRenderer />
</fx:Component>
</js:itemRenderer>
</js:DataGridColumn>
- <js:DataGridColumn label="Alert" dataField="greaterThan">
+ <js:DataGridColumn label="Alert" dataField="greaterThan" columnWidth="25">
<js:itemRenderer>
<fx:Component>
<renderers:AlertRenderer />
</fx:Component>
</js:itemRenderer>
</js:DataGridColumn>
- <js:DataGridColumn label="Message" dataField="message">
+ <js:DataGridColumn label="Message" dataField="message" columnWidth="25">
<js:itemRenderer>
<fx:Component>
<js:StringItemRenderer />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5cb269d9/examples/flexjs/MobileTrader/src/main/flex/views/AssetsView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/src/main/flex/views/AssetsView.mxml b/examples/flexjs/MobileTrader/src/main/flex/views/AssetsView.mxml
index 2929a3e..1d5bd2e 100755
--- a/examples/flexjs/MobileTrader/src/main/flex/views/AssetsView.mxml
+++ b/examples/flexjs/MobileTrader/src/main/flex/views/AssetsView.mxml
@@ -34,35 +34,34 @@ limitations under the License.
</fx:Metadata>
<js:beads>
- <js:VerticalLayout />
+ <js:VerticalFlexLayout />
</js:beads>
<js:model>
<models:AssetsModel />
</js:model>
- <js:Label text="Summary" height="10%" />
+ <js:Label text="Summary" className="AssetsViewTitle" />
- <js:DataGrid height="150" width="100%">
- <js:style>
- <js:SimpleCSSStyles top="0" left="0" right="0" />
- </js:style>
+ <js:DataGrid height="150" width="100%" className="AssetsViewGrid">
<js:beads>
+ <js:DataGridPercentageView />
<js:ConstantBinding
sourceID="model"
sourcePropertyName="assetsData"
destinationPropertyName="dataProvider" />
</js:beads>
<js:columns>
- <js:DataGridColumn label="Type" dataField="label" />
- <js:DataGridColumn label="Value" dataField="value" />
- <js:DataGridColumn label="Change" dataField="netChange" />
+ <js:DataGridColumn label="Type" dataField="label" columnWidth="50" />
+ <js:DataGridColumn label="Value" dataField="value" columnWidth="25" />
+ <js:DataGridColumn label="Change" dataField="netChange" columnWidth="25" />
</js:columns>
</js:DataGrid>
- <js:Label text="Performance History" height="10%" />
+ <js:Spacer height="10" />
+ <js:Label text="Performance History" className="AssetsViewTitle" />
- <js:BarChart id="barChart" width="100%" height="40%">
+ <js:BarChart id="barChart" className="AssetsViewChart" >
<js:beads>
<js:ConstantBinding
sourceID="model"
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5cb269d9/examples/flexjs/MobileTrader/src/main/flex/views/WatchListView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/src/main/flex/views/WatchListView.mxml b/examples/flexjs/MobileTrader/src/main/flex/views/WatchListView.mxml
index aa9da04..3b84f34 100755
--- a/examples/flexjs/MobileTrader/src/main/flex/views/WatchListView.mxml
+++ b/examples/flexjs/MobileTrader/src/main/flex/views/WatchListView.mxml
@@ -89,20 +89,24 @@ limitations under the License.
</fx:Script>
<js:beads>
- <js:VerticalLayout />
+ <js:VerticalFlexLayout />
</js:beads>
- <js:HContainer className="WatchListInputArea" width="100%" height="10%">
+ <js:Group width="100%" className="WatchListInputArea" >
+ <js:beads>
+ <js:HorizontalLayout />
+ </js:beads>
<js:Label text="Symbol:" />
<js:TextInput id="symbolName" />
<js:TextButton text="Add" click="addSymbol()" />
- </js:HContainer>
+ </js:Group>
<js:Spacer height="10" />
- <js:DataGrid id="dataGrid" width="100%" height="85%" change="selectRow()" className="WatchListDataGrid">
+ <js:DataGrid id="dataGrid" width="100%" change="selectRow()" className="WatchListDataGrid">
<js:beads>
- <js:DataProviderChangeNotifier sourceID="dataModel" propertyName="watchList" />
+ <!--<controller:DataModelChangeNotifier />-->
+ <js:DataGridPercentageView />
<js:SimpleBinding
eventName="update"
sourceID="dataModel"
@@ -110,35 +114,35 @@ limitations under the License.
destinationPropertyName="dataProvider" />
</js:beads>
<js:columns>
- <js:DataGridColumn label="Symbol" dataField="symbol">
+ <js:DataGridColumn label="Symbol" dataField="symbol" columnWidth="20">
<js:itemRenderer>
<fx:Component>
<js:StringItemRenderer />
</fx:Component>
</js:itemRenderer>
</js:DataGridColumn>
- <js:DataGridColumn label="Open" dataField="open">
+ <js:DataGridColumn label="Open" dataField="open" columnWidth="20">
<js:itemRenderer>
<fx:Component>
<renderers:StockRenderer />
</fx:Component>
</js:itemRenderer>
</js:DataGridColumn>
- <js:DataGridColumn label="Last" dataField="last" >
+ <js:DataGridColumn label="Last" dataField="last" columnWidth="20" >
<js:itemRenderer>
<fx:Component>
<renderers:StockRenderer />
</fx:Component>
</js:itemRenderer>
</js:DataGridColumn>
- <js:DataGridColumn label="High" dataField="high" >
+ <js:DataGridColumn label="High" dataField="high" columnWidth="20" >
<js:itemRenderer>
<fx:Component>
<renderers:StockRenderer />
</fx:Component>
</js:itemRenderer>
</js:DataGridColumn>
- <js:DataGridColumn label="Low" dataField="low" >
+ <js:DataGridColumn label="Low" dataField="low" columnWidth="20" >
<js:itemRenderer>
<fx:Component>
<renderers:StockRenderer />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5cb269d9/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/StackedViewManagerView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/StackedViewManagerView.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/StackedViewManagerView.as
index a500c12..c2c8837 100644
--- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/StackedViewManagerView.as
+++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/StackedViewManagerView.as
@@ -153,7 +153,8 @@ package org.apache.flex.mobile.beads
}
_topView = model.views[index] as IViewManagerView;
_topView.viewManager = _strand as IViewManager;
- UIBase(_strand).addElementAt(_topView,1);
+
+ UIBase(_strand).addElementAt(_topView,(navigationBar == null ? 0 : 1));
COMPILE::JS {
if (_topView) {
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5cb269d9/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/TabbedViewManagerView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/TabbedViewManagerView.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/TabbedViewManagerView.as
index 4ee3a5a..cd60094 100644
--- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/TabbedViewManagerView.as
+++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/TabbedViewManagerView.as
@@ -120,7 +120,7 @@ package org.apache.flex.mobile.beads
}
_currentView = model.views[index] as IViewManagerView;
_currentView.viewManager = _strand as IViewManager;
- UIBase(_strand).addElementAt(_currentView,1);
+ UIBase(_strand).addElementAt(_currentView,(navigationBar == null ? 0 : 1));
COMPILE::JS {
if (_currentView) {
[7/8] git commit: [flex-asjs] [refs/heads/develop] - Updates to
Mobile project. Getting closer.
Posted by pe...@apache.org.
Updates to Mobile project. Getting closer.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e3cbf4fc
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e3cbf4fc
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e3cbf4fc
Branch: refs/heads/develop
Commit: e3cbf4fc916a57ad99cd14527ae67168fd702271
Parents: fd5eaae
Author: Peter Ent <pe...@apache.org>
Authored: Fri Apr 14 16:20:30 2017 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Fri Apr 14 16:20:30 2017 -0400
----------------------------------------------------------------------
.../html/beads/layouts/HorizontalFlexLayout.as | 1 +
.../html/beads/layouts/VerticalFlexLayout.as | 1 +
.../Mobile/src/main/flex/MobileClasses.as | 1 -
.../apache/flex/mobile/ManagedContentArea.as | 55 --------------------
.../flex/mobile/beads/StackedViewManagerView.as | 40 ++++----------
.../flex/mobile/beads/TabbedViewManagerView.as | 41 ++++-----------
.../src/main/resources/basic-manifest.xml | 1 -
.../Mobile/src/main/resources/defaults.css | 7 ---
8 files changed, 21 insertions(+), 126 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3cbf4fc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalFlexLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalFlexLayout.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalFlexLayout.as
index cad6827..6fb927d 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalFlexLayout.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalFlexLayout.as
@@ -255,6 +255,7 @@ package org.apache.flex.html.beads.layouts
var child:UIBase = contentView.getElementAt(i) as UIBase;
if (grow >= 0) child.element.style["flex-grow"] = String(grow);
if (shrink >= 0) child.element.style["flex-shrink"] = String(shrink);
+ child.dispatchEvent(new Event("layoutNeeded"));
}
return true;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3cbf4fc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VerticalFlexLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VerticalFlexLayout.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VerticalFlexLayout.as
index f495acc..c543425 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VerticalFlexLayout.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VerticalFlexLayout.as
@@ -251,6 +251,7 @@ package org.apache.flex.html.beads.layouts
var child:UIBase = contentView.getElementAt(i) as UIBase;
if (grow >= 0) child.element.style["flex-grow"] = String(grow);
if (shrink >= 0) child.element.style["flex-shrink"] = String(shrink);
+ child.dispatchEvent(new Event("layoutNeeded"));
}
return true;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3cbf4fc/frameworks/projects/Mobile/src/main/flex/MobileClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/MobileClasses.as b/frameworks/projects/Mobile/src/main/flex/MobileClasses.as
index ea74217..7c650fd 100644
--- a/frameworks/projects/Mobile/src/main/flex/MobileClasses.as
+++ b/frameworks/projects/Mobile/src/main/flex/MobileClasses.as
@@ -33,7 +33,6 @@ internal class MobileClasses
import org.apache.flex.mobile.beads.DatePickerView; DatePickerView;
import org.apache.flex.mobile.ToggleSwitch; ToggleSwitch;
import org.apache.flex.mobile.ViewManagerBase; ViewManagerBase;
- import org.apache.flex.mobile.ManagedContentArea; ManagedContentArea;
import org.apache.flex.mobile.beads.StackedViewManagerView; StackedViewManagerView;
import org.apache.flex.mobile.beads.TabbedViewManagerView; TabbedViewManagerView;
import org.apache.flex.mobile.beads.ViewManagerViewBase; ViewManagerViewBase;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3cbf4fc/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ManagedContentArea.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ManagedContentArea.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ManagedContentArea.as
deleted file mode 100644
index 16081e5..0000000
--- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ManagedContentArea.as
+++ /dev/null
@@ -1,55 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.mobile
-{
- import org.apache.flex.core.UIBase;
- import org.apache.flex.html.Group;
- import org.apache.flex.events.Event;
-
- COMPILE::JS
- {
- import org.apache.flex.core.WrappedHTMLElement;
- }
-
- /**
- * The ManagedContentArea is the space in which views are displayed by the
- * view manager classes.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public class ManagedContentArea extends Group
- {
- /**
- * Constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function ManagedContentArea()
- {
- super();
- className = "ManagedContentArea";
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3cbf4fc/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/StackedViewManagerView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/StackedViewManagerView.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/StackedViewManagerView.as
index 2e4e009..a500c12 100644
--- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/StackedViewManagerView.as
+++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/StackedViewManagerView.as
@@ -22,13 +22,13 @@ package org.apache.flex.mobile.beads
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IViewportModel;
import org.apache.flex.core.UIBase;
+ import org.apache.flex.core.SimpleCSSStyles;
import org.apache.flex.events.IEventDispatcher;
import org.apache.flex.events.Event;
import org.apache.flex.html.beads.ContainerView;
import org.apache.flex.html.beads.layouts.HorizontalLayout;
import org.apache.flex.mobile.IViewManager;
import org.apache.flex.mobile.IViewManagerView;
- import org.apache.flex.mobile.ManagedContentArea;
import org.apache.flex.mobile.chrome.NavigationBar;
import org.apache.flex.mobile.chrome.ToolBar;
import org.apache.flex.mobile.models.ViewManagerModel;
@@ -63,13 +63,6 @@ package org.apache.flex.mobile.beads
* Children
*/
- private var _contentArea:ManagedContentArea;
-
- public function get contentArea():ManagedContentArea
- {
- return _contentArea;
- }
-
public function get toolBar():ToolBar
{
var model:ViewManagerModel = strand.getBeadByType(IBeadModel) as ViewManagerModel;
@@ -94,9 +87,6 @@ package org.apache.flex.mobile.beads
_strand = value;
super.strand = value;
- // The content area will hold the views
- _contentArea = new ManagedContentArea();
-
var model:ViewManagerModel = value.getBeadByType(IBeadModel) as ViewManagerModel;
if (model.toolBarItems)
@@ -116,11 +106,6 @@ package org.apache.flex.mobile.beads
IEventDispatcher(model).addEventListener("viewPushed", handlePushEvent);
IEventDispatcher(model).addEventListener("viewPopped", handlePopEvent);
- COMPILE::SWF {
- _contentArea.percentWidth = 100;
- }
- UIBase(_strand).addElement(_contentArea);
-
if (toolBar) {
UIBase(_strand).addElement(toolBar);
}
@@ -164,11 +149,11 @@ package org.apache.flex.mobile.beads
var model:ViewManagerModel = _strand.getBeadByType(IBeadModel) as ViewManagerModel;
if (_topView != null) {
- contentArea.removeElement(_topView);
+ UIBase(_strand).removeElement(_topView);
}
_topView = model.views[index] as IViewManagerView;
_topView.viewManager = _strand as IViewManager;
- contentArea.addElement(_topView);
+ UIBase(_strand).addElementAt(_topView,1);
COMPILE::JS {
if (_topView) {
@@ -176,22 +161,15 @@ package org.apache.flex.mobile.beads
}
}
COMPILE::SWF {
+ if (UIBase(_topView).style == null) {
+ UIBase(_topView).style = new SimpleCSSStyles();
+ }
+ UIBase(_topView).style.flexGrow = 1;
UIBase(_topView).percentWidth = 100;
- UIBase(_topView).percentHeight = 100;
- contentArea.layoutNeeded();
}
- }
-
- override public function afterLayout():void
- {
- super.afterLayout();
- COMPILE::SWF {
- if (_topView) {
- UIBase(_topView).width = contentArea.width;
- UIBase(_topView).height = contentArea.height;
- }
- }
+ // Now that a view has changed, refresh the layout for this component.
+ UIBase(_strand).dispatchEvent(new Event("layoutNeeded"));
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3cbf4fc/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/TabbedViewManagerView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/TabbedViewManagerView.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/TabbedViewManagerView.as
index 7959da0..4ee3a5a 100644
--- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/TabbedViewManagerView.as
+++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/TabbedViewManagerView.as
@@ -22,13 +22,13 @@ package org.apache.flex.mobile.beads
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IViewportModel;
import org.apache.flex.core.UIBase;
+ import org.apache.flex.core.SimpleCSSStyles;
import org.apache.flex.events.IEventDispatcher;
import org.apache.flex.events.Event;
import org.apache.flex.html.beads.ContainerView;
import org.apache.flex.html.beads.layouts.HorizontalLayout;
import org.apache.flex.mobile.IViewManager;
import org.apache.flex.mobile.IViewManagerView;
- import org.apache.flex.mobile.ManagedContentArea;
import org.apache.flex.mobile.chrome.NavigationBar;
import org.apache.flex.mobile.chrome.TabBar;
import org.apache.flex.mobile.models.ViewManagerModel;
@@ -64,8 +64,6 @@ package org.apache.flex.mobile.beads
* Children
*/
- private var _contentArea:ManagedContentArea;
-
public function get tabBar():TabBar
{
var model:ViewManagerModel = strand.getBeadByType(IBeadModel) as ViewManagerModel;
@@ -77,11 +75,6 @@ package org.apache.flex.mobile.beads
model.tabBar = value;
}
- public function get contentArea():ManagedContentArea
- {
- return _contentArea;
- }
-
/*
* ViewBead
*/
@@ -95,9 +88,6 @@ package org.apache.flex.mobile.beads
_strand = value;
super.strand = value;
- // The content area will hold the views
- _contentArea = new ManagedContentArea();
-
var model:ViewManagerModel = value.getBeadByType(IBeadModel) as ViewManagerModel;
// TabbedViewManager always has a TabBar
@@ -112,11 +102,6 @@ package org.apache.flex.mobile.beads
{
super.handleInitComplete(event);
- COMPILE::SWF {
- _contentArea.percentWidth = 100;
- }
- UIBase(_strand).addElement(_contentArea);
-
if (tabBar) {
UIBase(_strand).addElement(tabBar);
}
@@ -131,34 +116,28 @@ package org.apache.flex.mobile.beads
var model:ViewManagerModel = _strand.getBeadByType(IBeadModel) as ViewManagerModel;
if (_currentView != null) {
- contentArea.removeElement(_currentView);
+ UIBase(_strand).removeElement(_currentView);
}
_currentView = model.views[index] as IViewManagerView;
_currentView.viewManager = _strand as IViewManager;
- contentArea.addElement(_currentView);
+ UIBase(_strand).addElementAt(_currentView,1);
COMPILE::JS {
if (_currentView) {
UIBase(_currentView).element.style["flex-grow"] = "1";
}
+ UIBase(_strand).dispatchEvent(new Event("layoutNeeded"));
}
COMPILE::SWF {
+ if (UIBase(_currentView).style == null) {
+ UIBase(_currentView).style = new SimpleCSSStyles();
+ }
+ UIBase(_currentView).style.flexGrow = 1;
UIBase(_currentView).percentWidth = 100;
- UIBase(_currentView).percentHeight = 100;
- contentArea.layoutNeeded();
}
- }
-
- override public function afterLayout():void
- {
- super.afterLayout();
- COMPILE::SWF {
- if (_currentView) {
- UIBase(_currentView).width = contentArea.width;
- UIBase(_currentView).height = contentArea.height;
- }
- }
+ // Now that the view has changed, refresh the layout on this component.
+ UIBase(_strand).dispatchEvent(new Event("layoutNeeded"));
}
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3cbf4fc/frameworks/projects/Mobile/src/main/resources/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/resources/basic-manifest.xml b/frameworks/projects/Mobile/src/main/resources/basic-manifest.xml
index ac85e14..e0f523d 100644
--- a/frameworks/projects/Mobile/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Mobile/src/main/resources/basic-manifest.xml
@@ -23,7 +23,6 @@
<component id="StackedViewManager" class="org.apache.flex.mobile.StackedViewManager" />
<component id="TabbedViewManager" class="org.apache.flex.mobile.TabbedViewManager" />
<component id="TitleView" class="org.apache.flex.mobile.TitleView" />
- <component id="ManagedContentArea" class="org.apache.flex.mobile.ManagedContentArea" />
<component id="NavigationBar" class="org.apache.flex.mobile.chrome.NavigationBar" />
<component id="ToolBar" class="org.apache.flex.mobile.chrome.ToolBar" />
<component id="TabBar" class="org.apache.flex.mobile.chrome.TabBar" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3cbf4fc/frameworks/projects/Mobile/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/resources/defaults.css b/frameworks/projects/Mobile/src/main/resources/defaults.css
index f360d5c..569904e 100644
--- a/frameworks/projects/Mobile/src/main/resources/defaults.css
+++ b/frameworks/projects/Mobile/src/main/resources/defaults.css
@@ -42,13 +42,6 @@ TabbedViewManager
IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VerticalFlexLayout");
}
-ManagedContentArea
-{
- display: flex;
- flex-grow: 1;
- IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.BasicLayout");
-}
-
TabBar {
flex-grow: 0;
height: 40px;
[2/8] git commit: [flex-asjs] [refs/heads/develop] - Move layout
event control into LayoutBase from GroupView and updated affected classes.
Updated chart layouts to conform to new layout protocol.
Posted by pe...@apache.org.
Move layout event control into LayoutBase from GroupView and updated affected classes. Updated chart layouts to conform to new layout protocol.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/87efeed5
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/87efeed5
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/87efeed5
Branch: refs/heads/develop
Commit: 87efeed5750b3ecb94754e3dcd1156333102834d
Parents: ae5cb4e
Author: Peter Ent <pe...@apache.org>
Authored: Thu Apr 13 10:17:13 2017 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Thu Apr 13 10:17:13 2017 -0400
----------------------------------------------------------------------
.../org/apache/flex/charts/beads/ChartView.as | 12 +-
.../flex/charts/beads/layouts/BarChartLayout.as | 6 +-
.../beads/layouts/BarChartLayoutForArrayList.as | 8 +-
.../charts/beads/layouts/ChartBaseLayout.as | 25 ++--
.../charts/beads/layouts/ColumnChartLayout.as | 6 +-
.../layouts/ColumnChartLayoutForArrayList.as | 6 +-
.../layouts/LineChartCategoryVsLinearLayout.as | 6 +-
.../layouts/LineChartLinearVsLinearLayout.as | 6 +-
.../flex/charts/beads/layouts/PieChartLayout.as | 6 +-
.../beads/layouts/PieChartLayoutForArrayList.as | 6 +-
.../beads/layouts/StackedBarChartLayout.as | 6 +-
.../StackedBarChartLayoutForArrayList.as | 6 +-
.../beads/layouts/StackedColumnChartLayout.as | 6 +-
.../StackedColumnChartLayoutForArrayList.as | 6 +-
.../flex/org/apache/flex/core/ILayoutHost.as | 20 ++++
.../main/flex/org/apache/flex/core/GroupBase.as | 13 ++
.../flex/org/apache/flex/core/LayoutBase.as | 118 +++++++++++++++++++
.../html/beads/AccordionItemRendererView.as | 2 +-
.../org/apache/flex/html/beads/ContainerView.as | 46 ++++----
.../apache/flex/html/beads/DataContainerView.as | 25 ++--
.../org/apache/flex/html/beads/GroupView.as | 112 +-----------------
.../flex/html/beads/layouts/ButtonBarLayout.as | 3 +
.../ButtonBarButtonItemRenderer.as | 9 +-
.../html/supportClasses/MXMLItemRenderer.as | 10 ++
.../HTML/src/main/resources/defaults.css | 1 +
25 files changed, 282 insertions(+), 188 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87efeed5/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/ChartView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/ChartView.as b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/ChartView.as
index 0d089c6..2dd7d81 100644
--- a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/ChartView.as
+++ b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/ChartView.as
@@ -165,14 +165,6 @@ package org.apache.flex.charts.beads
dataGroup.removeAllItemRenderers();
}
-
- /**
- * @private
- */
- override protected function handleChildrenAdded(event:Event):void
- {
- // ignore for charts.
- }
/**
* ChartView overrides performLayout so that the exact area of the ChartDataGroup can
@@ -184,7 +176,7 @@ package org.apache.flex.charts.beads
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- override protected function layoutViewBeforeContentLayout():void
+ override public function beforeLayout():void
{
var metrics:Rectangle = CSSContainerUtils.getBorderAndPaddingMetrics(_strand);
@@ -233,7 +225,7 @@ package org.apache.flex.charts.beads
/**
* @private
*/
- override protected function layoutViewAfterContentLayout():void
+ override public function afterLayout():void
{
// ignore for charts
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87efeed5/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/BarChartLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/BarChartLayout.as b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/BarChartLayout.as
index 4172b1c..3419dbf 100644
--- a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/BarChartLayout.as
+++ b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/BarChartLayout.as
@@ -76,12 +76,12 @@ package org.apache.flex.charts.beads.layouts
/**
* @private
*/
- override protected function performLayout():void
+ override public function layout():Boolean
{
var selectionModel:ISelectionModel = strand.getBeadByType(ISelectionModel) as ISelectionModel;
var dp:Array = selectionModel.dataProvider as Array;
if (!dp)
- return;
+ return false;
var n:int = dp.length;
var useWidth:Number = UIBase(chartDataGroup).width;
@@ -148,6 +148,8 @@ package org.apache.flex.charts.beads.layouts
ypos -= gap;
}
+
+ return true;
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87efeed5/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/BarChartLayoutForArrayList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/BarChartLayoutForArrayList.as b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/BarChartLayoutForArrayList.as
index 39710e8..049055f 100644
--- a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/BarChartLayoutForArrayList.as
+++ b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/BarChartLayoutForArrayList.as
@@ -56,14 +56,14 @@ package org.apache.flex.charts.beads.layouts
/**
* @private
*/
- override protected function performLayout():void
+ override public function layout():Boolean
{
var selectionModel:ISelectionModel = strand.getBeadByType(ISelectionModel) as ISelectionModel;
var dp:ArrayList = selectionModel.dataProvider as ArrayList;
if (!dp)
- return;
+ return false;
if (dp.length == 0)
- return;
+ return false;
var n:int = dp.length;
var useWidth:Number = UIBase(chartDataGroup).width;
@@ -130,6 +130,8 @@ package org.apache.flex.charts.beads.layouts
ypos -= gap;
}
+
+ return true;
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87efeed5/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/ChartBaseLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/ChartBaseLayout.as b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/ChartBaseLayout.as
index 24760b4..5b8d1ff 100644
--- a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/ChartBaseLayout.as
+++ b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/ChartBaseLayout.as
@@ -22,16 +22,18 @@ package org.apache.flex.charts.beads.layouts
import org.apache.flex.charts.core.IChartDataGroup;
import org.apache.flex.charts.core.IHorizontalAxisBead;
import org.apache.flex.charts.core.IVerticalAxisBead;
+ import org.apache.flex.core.LayoutBase;
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.ILayoutHost;
import org.apache.flex.core.IStrand;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
- public class ChartBaseLayout implements IBeadLayout
+ public class ChartBaseLayout extends LayoutBase implements IBeadLayout
{
public function ChartBaseLayout()
{
+ super();
}
private var _strand:IStrand;
@@ -44,8 +46,9 @@ package org.apache.flex.charts.beads.layouts
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function set strand(value:IStrand):void
+ override public function set strand(value:IStrand):void
{
+ super.strand = value;
_strand = value;
}
public function get strand():IStrand
@@ -125,11 +128,11 @@ package org.apache.flex.charts.beads.layouts
/**
* @copy org.apache.flex.core.IBeadLayout#layout
*/
- public function layout():Boolean
- {
- performLayout();
- return true;
- }
+// public function layout():Boolean
+// {
+// performLayout();
+// return true;
+// }
/**
* Subclasses should implement this to draw the chart, adding elements to the chartDataGroup.
@@ -139,9 +142,9 @@ package org.apache.flex.charts.beads.layouts
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- protected function performLayout():void
- {
- // implement in subclass
- }
+// protected function performLayout():void
+// {
+// // implement in subclass
+// }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87efeed5/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/ColumnChartLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/ColumnChartLayout.as b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/ColumnChartLayout.as
index 56f5f10..cad0ede 100644
--- a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/ColumnChartLayout.as
+++ b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/ColumnChartLayout.as
@@ -67,12 +67,12 @@ package org.apache.flex.charts.beads.layouts
/**
* @private
*/
- override protected function performLayout():void
+ override public function layout():Boolean
{
var selectionModel:ISelectionModel = strand.getBeadByType(ISelectionModel) as ISelectionModel;
var dp:Array = selectionModel.dataProvider as Array;
if (!dp)
- return;
+ return false;
var n:int = dp.length;
var xpos:Number = 0;
@@ -137,6 +137,8 @@ package org.apache.flex.charts.beads.layouts
xpos += gap;
}
+
+ return true;
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87efeed5/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/ColumnChartLayoutForArrayList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/ColumnChartLayoutForArrayList.as b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/ColumnChartLayoutForArrayList.as
index 64b065d..93387da 100644
--- a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/ColumnChartLayoutForArrayList.as
+++ b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/ColumnChartLayoutForArrayList.as
@@ -56,12 +56,12 @@ package org.apache.flex.charts.beads.layouts
/**
* @private
*/
- override protected function performLayout():void
+ override public function layout():Boolean
{
var selectionModel:ISelectionModel = strand.getBeadByType(ISelectionModel) as ISelectionModel;
var dp:ArrayList = selectionModel.dataProvider as ArrayList;
if (!dp)
- return;
+ return false;
var n:int = dp.length;
var xpos:Number = 0;
@@ -126,6 +126,8 @@ package org.apache.flex.charts.beads.layouts
xpos += gap;
}
+
+ return true;
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87efeed5/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/LineChartCategoryVsLinearLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/LineChartCategoryVsLinearLayout.as b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/LineChartCategoryVsLinearLayout.as
index 10b1324..505abb1 100644
--- a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/LineChartCategoryVsLinearLayout.as
+++ b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/LineChartCategoryVsLinearLayout.as
@@ -49,12 +49,12 @@ package org.apache.flex.charts.beads.layouts
/**
* @private
*/
- override protected function performLayout():void
+ override public function layout():Boolean
{
var selectionModel:ISelectionModel = strand.getBeadByType(ISelectionModel) as ISelectionModel;
var dp:Array = selectionModel.dataProvider as Array;
if (!dp)
- return;
+ return false;
var layoutParent:ILayoutHost = strand.getBeadByType(ILayoutHost) as ILayoutHost;
var contentView:IParentIUIBase = layoutParent.contentView as IParentIUIBase;
@@ -149,6 +149,8 @@ package org.apache.flex.charts.beads.layouts
renderer.points = seriesPoints[s].points;
}
}
+
+ return true;
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87efeed5/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/LineChartLinearVsLinearLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/LineChartLinearVsLinearLayout.as b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/LineChartLinearVsLinearLayout.as
index 4dd0ab3..8b410d3 100644
--- a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/LineChartLinearVsLinearLayout.as
+++ b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/LineChartLinearVsLinearLayout.as
@@ -49,12 +49,12 @@ package org.apache.flex.charts.beads.layouts
/**
* @private
*/
- override protected function performLayout():void
+ override public function layout():Boolean
{
var selectionModel:ISelectionModel = strand.getBeadByType(ISelectionModel) as ISelectionModel;
var dp:Array = selectionModel.dataProvider as Array;
if (!dp)
- return;
+ return false;
var layoutParent:ILayoutHost = strand.getBeadByType(ILayoutHost) as ILayoutHost;
var contentView:IParentIUIBase = layoutParent.contentView as IParentIUIBase;
@@ -163,6 +163,8 @@ package org.apache.flex.charts.beads.layouts
renderer.points = seriesPoints[s].points;
}
}
+
+ return true;
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87efeed5/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/PieChartLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/PieChartLayout.as b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/PieChartLayout.as
index 0ec982a..c49e47d 100644
--- a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/PieChartLayout.as
+++ b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/PieChartLayout.as
@@ -57,12 +57,12 @@ package org.apache.flex.charts.beads.layouts
/**
* @private
*/
- override protected function performLayout():void
+ override public function layout():Boolean
{
var selectionModel:ISelectionModel = strand.getBeadByType(ISelectionModel) as ISelectionModel;
var dp:Array = selectionModel.dataProvider as Array;
if (!dp)
- return;
+ return false;
var layoutParent:ILayoutHost = strand.getBeadByType(ILayoutHost) as ILayoutHost;
var contentView:IParentIUIBase = layoutParent.contentView as IParentIUIBase;
@@ -133,6 +133,8 @@ package org.apache.flex.charts.beads.layouts
start += arc;
}
}
+
+ return true;
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87efeed5/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/PieChartLayoutForArrayList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/PieChartLayoutForArrayList.as b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/PieChartLayoutForArrayList.as
index f206cc4..1acedb3 100644
--- a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/PieChartLayoutForArrayList.as
+++ b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/PieChartLayoutForArrayList.as
@@ -59,12 +59,12 @@ package org.apache.flex.charts.beads.layouts
/**
* @private
*/
- override protected function performLayout():void
+ override public function layout():Boolean
{
var selectionModel:ISelectionModel = strand.getBeadByType(ISelectionModel) as ISelectionModel;
var dp:ArrayList = selectionModel.dataProvider as ArrayList;
if (!dp)
- return;
+ return false;
var layoutParent:ILayoutHost = strand.getBeadByType(ILayoutHost) as ILayoutHost;
var contentView:IParentIUIBase = layoutParent.contentView as IParentIUIBase;
@@ -135,6 +135,8 @@ package org.apache.flex.charts.beads.layouts
start += arc;
}
}
+
+ return true;
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87efeed5/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/StackedBarChartLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/StackedBarChartLayout.as b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/StackedBarChartLayout.as
index 61a910e..6795755 100644
--- a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/StackedBarChartLayout.as
+++ b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/StackedBarChartLayout.as
@@ -77,12 +77,12 @@ package org.apache.flex.charts.beads.layouts
/**
* @private
*/
- override protected function performLayout():void
+ override public function layout():Boolean
{
var selectionModel:ISelectionModel = strand.getBeadByType(ISelectionModel) as ISelectionModel;
var dp:Array = selectionModel.dataProvider as Array;
if (!dp)
- return;
+ return false;
var layoutParent:ILayoutHost = strand.getBeadByType(ILayoutHost) as ILayoutHost;
var contentView:IParentIUIBase = layoutParent.contentView as IParentIUIBase;
@@ -161,6 +161,8 @@ package org.apache.flex.charts.beads.layouts
ypos -= (itemHeight + gap);
}
+
+ return true;
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87efeed5/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/StackedBarChartLayoutForArrayList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/StackedBarChartLayoutForArrayList.as b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/StackedBarChartLayoutForArrayList.as
index 9edab56..f91add4 100644
--- a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/StackedBarChartLayoutForArrayList.as
+++ b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/StackedBarChartLayoutForArrayList.as
@@ -58,12 +58,12 @@ package org.apache.flex.charts.beads.layouts
/**
* @private
*/
- override protected function performLayout():void
+ override public function layout():Boolean
{
var selectionModel:ISelectionModel = strand.getBeadByType(ISelectionModel) as ISelectionModel;
var dp:ArrayList = selectionModel.dataProvider as ArrayList;
if (!dp)
- return;
+ return false;
var layoutParent:ILayoutHost = strand.getBeadByType(ILayoutHost) as ILayoutHost;
var contentView:IParentIUIBase = layoutParent.contentView as IParentIUIBase;
@@ -142,6 +142,8 @@ package org.apache.flex.charts.beads.layouts
ypos -= (itemHeight + gap);
}
+
+ return true;
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87efeed5/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/StackedColumnChartLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/StackedColumnChartLayout.as b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/StackedColumnChartLayout.as
index fbe5989..0879769 100644
--- a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/StackedColumnChartLayout.as
+++ b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/StackedColumnChartLayout.as
@@ -76,12 +76,12 @@ package org.apache.flex.charts.beads.layouts
/**
* @private
*/
- override protected function performLayout():void
+ override public function layout():Boolean
{
var selectionModel:ISelectionModel = strand.getBeadByType(ISelectionModel) as ISelectionModel;
var dp:Array = selectionModel.dataProvider as Array;
if (!dp)
- return;
+ return false;
var layoutParent:ILayoutHost = strand.getBeadByType(ILayoutHost) as ILayoutHost;
var contentView:IParentIUIBase = layoutParent.contentView as IParentIUIBase;
@@ -158,6 +158,8 @@ package org.apache.flex.charts.beads.layouts
xpos += gap + itemWidth;
}
+
+ return true;
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87efeed5/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/StackedColumnChartLayoutForArrayList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/StackedColumnChartLayoutForArrayList.as b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/StackedColumnChartLayoutForArrayList.as
index 355205a..bc1a136 100644
--- a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/StackedColumnChartLayoutForArrayList.as
+++ b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/beads/layouts/StackedColumnChartLayoutForArrayList.as
@@ -57,12 +57,12 @@ package org.apache.flex.charts.beads.layouts
/**
* @private
*/
- override protected function performLayout():void
+ override public function layout():Boolean
{
var selectionModel:ISelectionModel = strand.getBeadByType(ISelectionModel) as ISelectionModel;
var dp:ArrayList = selectionModel.dataProvider as ArrayList;
if (!dp)
- return;
+ return false;
var layoutParent:ILayoutHost = strand.getBeadByType(ILayoutHost) as ILayoutHost;
var contentView:IParentIUIBase = layoutParent.contentView as IParentIUIBase;
@@ -139,6 +139,8 @@ package org.apache.flex.charts.beads.layouts
xpos += gap + itemWidth;
}
+
+ return true;
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87efeed5/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ILayoutHost.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ILayoutHost.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ILayoutHost.as
index dfd85d6..06d3084 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ILayoutHost.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ILayoutHost.as
@@ -40,5 +40,25 @@ package org.apache.flex.core
* @productversion FlexJS 0.8
*/
function get contentView():ILayoutView;
+
+ /**
+ * Invoked prior to performing the layout.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
+ function beforeLayout():void;
+
+ /**
+ * Invoked after performing the layout.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
+ function afterLayout():void;
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87efeed5/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/GroupBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/GroupBase.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/GroupBase.as
index e4dfb1f..815101a 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/GroupBase.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/GroupBase.as
@@ -101,6 +101,19 @@ package org.apache.flex.core
return element;
}
+ override public function addedToParent():void
+ {
+ super.addedToParent();
+
+ // Load the layout bead if it hasn't already been loaded.
+ var layout:IBeadLayout = getBeadByType(IBeadLayout) as IBeadLayout;
+ if (!layout)
+ {
+ layout = new (ValuesManager.valuesImpl.getValue(this, "iBeadLayout")) as IBeadLayout;
+ addBead(layout);
+ }
+ }
+
/*
* IContainer
*/
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87efeed5/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/LayoutBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/LayoutBase.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/LayoutBase.as
index dde6448..f23f035 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/LayoutBase.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/LayoutBase.as
@@ -27,6 +27,8 @@ package org.apache.flex.core
import org.apache.flex.core.IParent;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.ValuesManager;
+ import org.apache.flex.events.IEventDispatcher;
+ import org.apache.flex.events.Event;
import org.apache.flex.utils.CSSUtils;
/**
@@ -76,6 +78,92 @@ package org.apache.flex.core
public function set strand(value:IStrand):void
{
host = value as ILayoutChild;
+
+ IEventDispatcher(host).addEventListener("widthChanged", handleSizeChange);
+ IEventDispatcher(host).addEventListener("heightChanged", handleSizeChange);
+ IEventDispatcher(host).addEventListener("sizeChanged", handleSizeChange);
+
+ IEventDispatcher(host).addEventListener("childrenAdded", handleChildrenAdded);
+ IEventDispatcher(host).addEventListener("initComplete", handleInitComplete);
+
+ IEventDispatcher(host).addEventListener("layoutNeeded", handleLayoutNeeded);
+ }
+
+ /**
+ * Changes in size to the host strand are handled (by default) by running the
+ * layout sequence. Subclasses can override this function and use event.type
+ * to handle specific changes in dimension.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
+ protected function handleSizeChange(event:Event):void
+ {
+ performLayout();
+ }
+
+ /**
+ * Handles the addition of children to the host's layoutView by listening for
+ * size changes in the children.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
+ protected function handleChildrenAdded(event:Event):void
+ {
+ COMPILE::SWF {
+ var n:Number = layoutView.numElements;
+ for(var i:int=0; i < n; i++) {
+ var child:IEventDispatcher = layoutView.getElementAt(i) as IEventDispatcher;
+ child.addEventListener("widthChanged", childResizeHandler);
+ child.addEventListener("heightChanged", childResizeHandler);
+ child.addEventListener("sizeChanged", childResizeHandler);
+ }
+ }
+ }
+
+ /**
+ * If changes happen to a layoutView's child, this function will perform the
+ * layout again.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
+ protected function childResizeHandler(event:Event):void
+ {
+ performLayout();
+ }
+
+ /**
+ * Called whenever "layoutNeeded" event is dispatched against the host strand.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
+ protected function handleLayoutNeeded(event:Event):void
+ {
+ performLayout();
+ }
+
+ /**
+ * Handles the final start-up condition by running the layout an initial time.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
+ protected function handleInitComplete(event:Event):void
+ {
+ performLayout();
}
/**
@@ -148,6 +236,36 @@ package org.apache.flex.core
var viewBead:ILayoutHost = (host as ILayoutParent).getLayoutHost();
return viewBead.contentView;
}
+
+ private var isLayoutRunning:Boolean = false;
+
+ /**
+ * Performs the layout in three parts: before, layout, after.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
+ public function performLayout():void
+ {
+ // avoid running this layout instance recursively.
+ if (isLayoutRunning) return;
+
+ isLayoutRunning = true;
+
+ var viewBead:ILayoutHost = (host as ILayoutParent).getLayoutHost();
+
+ viewBead.beforeLayout();
+
+ if (layout()) {
+ viewBead.afterLayout();
+ }
+
+ isLayoutRunning = false;
+
+ IEventDispatcher(host).dispatchEvent(new Event("layoutComplete"));
+ }
/**
* @copy org.apache.flex.core.IBeadLayout#layout
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87efeed5/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/AccordionItemRendererView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/AccordionItemRendererView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/AccordionItemRendererView.as
index bc9f89d..85e2b79 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/AccordionItemRendererView.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/AccordionItemRendererView.as
@@ -58,7 +58,7 @@ package org.apache.flex.html.beads
{
COMPILE::SWF {
// no longer needed layoutViewBeforeContentLayout();
- layoutViewAfterContentLayout();
+ afterLayout();
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87efeed5/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ContainerView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ContainerView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ContainerView.as
index 4de5634..ac723a9 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ContainerView.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ContainerView.as
@@ -166,7 +166,7 @@ package org.apache.flex.html.beads
// when the first layout is complete, set up listeners for changes
// to the childrens' sizes.
- host.addEventListener("layoutComplete", childrenChangedHandler);
+// host.addEventListener("layoutComplete", childrenChangedHandler);
}
/**
@@ -229,7 +229,7 @@ package org.apache.flex.html.beads
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- override protected function layoutViewBeforeContentLayout():void
+ override public function beforeLayout():void
{
var host:ILayoutChild = this.host as ILayoutChild;
var vm:IViewportModel = viewportModel;
@@ -259,13 +259,13 @@ package org.apache.flex.html.beads
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- override protected function layoutViewAfterContentLayout():void
+ override public function afterLayout():void
{
if (adjusting) return;
adjusting = true;
- super.layoutViewAfterContentLayout();
+ super.afterLayout();
var contentSize:Size = calculateContentSize();
viewport.layoutViewportAfterContentLayout(contentSize);
@@ -282,12 +282,12 @@ package org.apache.flex.html.beads
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- override protected function resizeHandler(event:Event):void
- {
- if (!adjusting) {
- performLayout(event);
- }
- }
+// override protected function resizeHandler(event:Event):void
+// {
+// if (!adjusting) {
+// performLayout(event);
+// }
+// }
/**
* Whenever children are added, listeners are added to detect changes
@@ -298,19 +298,19 @@ package org.apache.flex.html.beads
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- protected function childrenChangedHandler(event:Event):void
- {
- var host:UIBase = _strand as UIBase;
- host.removeEventListener(event.type, childrenChangedHandler);
-
- var n:Number = contentView.numElements;
- for (var i:int=0; i < n; i++) {
- var child:IUIBase = contentView.getElementAt(i) as IUIBase;
- child.addEventListener("widthChanged", childResizeHandler);
- child.addEventListener("heightChanged", childResizeHandler);
- child.addEventListener("sizeChanged", childResizeHandler);
- }
- }
+// protected function childrenChangedHandler(event:Event):void
+// {
+// var host:UIBase = _strand as UIBase;
+// host.removeEventListener(event.type, childrenChangedHandler);
+//
+// var n:Number = contentView.numElements;
+// for (var i:int=0; i < n; i++) {
+// var child:IUIBase = contentView.getElementAt(i) as IUIBase;
+// child.addEventListener("widthChanged", childResizeHandler);
+// child.addEventListener("heightChanged", childResizeHandler);
+// child.addEventListener("sizeChanged", childResizeHandler);
+// }
+// }
}
COMPILE::JS
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87efeed5/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataContainerView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataContainerView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataContainerView.as
index 36ed489..6d1eae5 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataContainerView.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataContainerView.as
@@ -24,16 +24,17 @@ package org.apache.flex.html.beads
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.IBeadModel;
import org.apache.flex.core.IBeadView;
- import org.apache.flex.core.IList;
- import org.apache.flex.core.ISelectableItemRenderer;
+ import org.apache.flex.core.IDataProviderModel;
import org.apache.flex.core.IItemRenderer;
import org.apache.flex.core.IItemRendererParent;
+ import org.apache.flex.core.IList;
import org.apache.flex.core.IParent;
- import org.apache.flex.core.IParentIUIBase;
- import org.apache.flex.core.IDataProviderModel;
+ import org.apache.flex.core.IParentIUIBase;
+ import org.apache.flex.core.ISelectableItemRenderer;
import org.apache.flex.core.ISelectionModel;
import org.apache.flex.core.IStrand;
- import org.apache.flex.core.IUIBase;
+ import org.apache.flex.core.IUIBase;
+ import org.apache.flex.core.LayoutBase;
import org.apache.flex.core.Strand;
import org.apache.flex.core.UIBase;
import org.apache.flex.core.ValuesManager;
@@ -108,7 +109,8 @@ package org.apache.flex.html.beads
*/
protected function itemsCreatedHandler(event:Event):void
{
- performLayout(event);
+ trace("DataContainerView: itemsCreatedHandler");
+ host.dispatchEvent(new Event("layoutNeeded"));
}
/**
@@ -116,6 +118,7 @@ package org.apache.flex.html.beads
*/
protected function dataProviderChangeHandler(event:Event):void
{
+ trace("DataContainerView: dataProviderChangeHandler");
performLayout(event);
}
}
@@ -152,6 +155,7 @@ package org.apache.flex.html.beads
super.strand = value;
host.addEventListener("beadsAdded", beadsAddedHandler);
+ host.addEventListener("itemsCreated", itemsCreatedHandler);
}
override protected function completeSetup():void
@@ -160,9 +164,8 @@ package org.apache.flex.html.beads
// 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", itemsCreatedHandler);
+// host.removeEventListener("childrenAdded", childrenChangedHandler);
+// host.removeEventListener("childrenAdded", performLayout);
}
protected function beadsAddedHandler(event:Event):void
@@ -202,7 +205,8 @@ package org.apache.flex.html.beads
*/
protected function itemsCreatedHandler(event:Event):void
{
- performLayout(event);
+ trace("DataContainerView: itemsCreatedHandler");
+ host.dispatchEvent(new Event("layoutNeeded"));
}
/**
@@ -210,6 +214,7 @@ package org.apache.flex.html.beads
*/
protected function dataProviderChangeHandler(event:Event):void
{
+ trace("DataContainerView: dataProviderChangeHandler");
performLayout(event);
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87efeed5/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/GroupView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/GroupView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/GroupView.as
index c3351a5..acd805d 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/GroupView.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/GroupView.as
@@ -118,13 +118,6 @@ package org.apache.flex.html.beads
// listen for initComplete to signal that the strand has been initialized
// with its beads and children.
host.addEventListener("initComplete", handleInitComplete);
-
- // listen for when children have been added so additional event listeners
- // can be placed upon them.
- host.addEventListener("childrenAdded", handleChildrenAdded);
-
- // listen for requests to run the layout.
- host.addEventListener("layoutNeeded", performLayout);
}
/**
@@ -169,12 +162,6 @@ package org.apache.flex.html.beads
host.removeEventListener("heightChanged", deferredSizeHandler);
completeSetup();
-
- var num:Number = contentView.numElements;
- if (num > 0)
- {
- performLayout(event);
- }
}
/**
@@ -193,42 +180,6 @@ package org.apache.flex.html.beads
host.addEventListener("widthChanged", resizeHandler);
host.addEventListener("heightChanged", resizeHandler);
}
-
- /**
- * Handles the viewCreated event by performing the first layout if
- * there are children already present (ie, from MXML).
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- protected function viewCreatedHandler(event:Event):void
- {
- var num:Number = contentView.numElements;
- if (num > 0)
- {
- performLayout(event);
- }
- }
-
- /**
- * @private
- */
- protected function handleChildrenAdded(event:Event):void
- {
- COMPILE::SWF {
- var n:Number = contentView.numElements;
- for(var i:int=0; i < n; i++) {
- var child:IEventDispatcher = contentView.getElementAt(i) as IEventDispatcher;
- child.addEventListener("widthChanged", childResizeHandler);
- child.addEventListener("heightChanged", childResizeHandler);
- child.addEventListener("sizeChanged", childResizeHandler);
- }
- }
-
- performLayout(event);
- }
/**
* Invoked in response to the strand being resized.
@@ -240,20 +191,8 @@ package org.apache.flex.html.beads
*/
protected function resizeHandler(event:Event):void
{
- performLayout(event);
- }
-
- /**
- * Invoked in response to any child being resized.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- protected function childResizeHandler(event:Event):void
- {
- performLayout(event);
+ // override in subclasses in case there is something besides running
+ // the layout (which is handled automatically by the layout itself).
}
/**
@@ -264,7 +203,7 @@ package org.apache.flex.html.beads
* @playerversion AIR 2.6
* @productversion FlexJS 0.8
*/
- protected function layoutViewBeforeContentLayout():void
+ public function beforeLayout():void
{
// This has no use for Group but is here so a subclass can override it.
}
@@ -281,34 +220,7 @@ package org.apache.flex.html.beads
*/
protected function performLayout(event:Event):void
{
- if (layoutRunning) return;
-
- layoutRunning = true;
-
- // pre-process before layout
- layoutViewBeforeContentLayout();
-
- var host:UIBase = _strand as UIBase;
-
- var layout:IBeadLayout = _strand.getBeadByType(IBeadLayout) as IBeadLayout;
- if (layout == null) {
- var c:Class = ValuesManager.valuesImpl.getValue(host, "iBeadLayout");
- if (c) {
- layout = new c() as IBeadLayout;
- _strand.addBead(layout);
- }
- }
-
- if (layout) {
- layout.layout();
- }
-
- // cleanup or adjust after layout
- layoutViewAfterContentLayout();
-
- layoutRunning = false;
-
- host.dispatchEvent(new Event("layoutComplete"));
+ trace("CALLING performLayout !!!!");
}
/**
@@ -344,11 +256,6 @@ package org.apache.flex.html.beads
}
/**
- * @private
- */
- private var adjusting:Boolean = false;
-
- /**
* Adjusts the size of the host after the layout has been run.
*
* @langversion 3.0
@@ -357,14 +264,9 @@ package org.apache.flex.html.beads
* @productversion FlexJS 0.0
*/
COMPILE::SWF
- protected function layoutViewAfterContentLayout():void
+ public function afterLayout():void
{
- if (adjusting) return;
-
var host:UIBase = _strand as UIBase;
-
- adjusting = true;
-
var contentSize:Size = calculateContentSize();
if (host.isWidthSizedToContent() && host.isHeightSizedToContent()) {
@@ -378,12 +280,10 @@ package org.apache.flex.html.beads
{
host.setWidth(contentSize.width, true);
}
-
- adjusting = false;
}
COMPILE::JS
- protected function layoutViewAfterContentLayout():void
+ public function afterLayout():void
{
// maybe useful in a subclass on the JS side.
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87efeed5/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/ButtonBarLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/ButtonBarLayout.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/ButtonBarLayout.as
index 761e1c7..f4b0e81 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/ButtonBarLayout.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/ButtonBarLayout.as
@@ -37,6 +37,7 @@ package org.apache.flex.html.beads.layouts
import org.apache.flex.html.List;
import org.apache.flex.html.beads.ButtonBarView;
import org.apache.flex.html.beads.models.ButtonBarModel;
+ import org.apache.flex.html.supportClasses.UIItemRendererBase;
import org.apache.flex.geom.Rectangle;
import org.apache.flex.utils.CSSUtils;
import org.apache.flex.utils.CSSContainerUtils;
@@ -162,6 +163,8 @@ package org.apache.flex.html.beads.layouts
UIBase(ir).height = contentView.height;
}
+
+ UIItemRendererBase(ir).adjustSize();
}
// now let the horizontal layout take care of things.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87efeed5/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.as
index 214125e..04049ef 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.as
@@ -155,8 +155,13 @@ package org.apache.flex.html.supportClasses
*/
override public function adjustSize():void
{
- textButton.width = this.width;
- textButton.height = this.height;
+ COMPILE::SWF {
+ textButton.width = this.width;
+ textButton.height = this.height;
+ }
+ COMPILE::JS {
+ textButton.percentWidth = 100;
+ }
updateRenderer();
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87efeed5/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/MXMLItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/MXMLItemRenderer.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/MXMLItemRenderer.as
index de1b304..d9b130e 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/MXMLItemRenderer.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/MXMLItemRenderer.as
@@ -78,6 +78,16 @@ package org.apache.flex.html.supportClasses
layout.layout();
}
}
+
+ public function beforeLayout():void
+ {
+
+ }
+
+ public function afterLayout():void
+ {
+
+ }
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87efeed5/frameworks/projects/HTML/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/resources/defaults.css b/frameworks/projects/HTML/src/main/resources/defaults.css
index 88d24c5..78cb15d 100644
--- a/frameworks/projects/HTML/src/main/resources/defaults.css
+++ b/frameworks/projects/HTML/src/main/resources/defaults.css
@@ -493,6 +493,7 @@ TitleBar
padding: 2px;
height: 30px;
flex-grow: 0;
+ min-height: 30px;
}
TitleBar .TitleBarCloseButton {