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/11 16:00:55 UTC
[30/44] git commit: [flex-asjs] [refs/heads/develop] - More changes
to components.
More changes to components.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d7fb6b1d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d7fb6b1d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d7fb6b1d
Branch: refs/heads/develop
Commit: d7fb6b1d7d0eb5b498912cc3263c7342e9bb2f36
Parents: b71b02f
Author: Peter Ent <pe...@apache.org>
Authored: Thu Apr 6 17:38:54 2017 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Thu Apr 6 17:38:54 2017 -0400
----------------------------------------------------------------------
.../main/flex/org/apache/flex/core/GroupBase.as | 13 ++++++++
.../flex/org/apache/flex/html/ControlBar.as | 4 +--
.../flex/org/apache/flex/html/DateChooser.as | 4 ---
.../flex/html/beads/DataGridPercentageView.as | 2 ++
.../org/apache/flex/html/beads/DataGridView.as | 5 ++++
.../DataItemRendererFactoryForColumnData.as | 2 +-
.../apache/flex/html/beads/DateChooserView.as | 25 +++++++++++-----
.../org/apache/flex/html/beads/DateFieldView.as | 2 +-
.../org/apache/flex/html/beads/GroupView.as | 4 +--
.../html/beads/layouts/HorizontalFlexLayout.as | 7 +++--
.../flex/html/beads/layouts/TileLayout.as | 1 -
.../html/beads/layouts/VerticalFlexLayout.as | 10 +++----
.../HTML/src/main/resources/defaults.css | 31 +++++++++-----------
.../flex/org/apache/flex/mobile/TitleView.as | 4 +--
14 files changed, 69 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d7fb6b1d/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 565b2e4..0c2797b 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
@@ -110,6 +110,19 @@ package org.apache.flex.core
}
/**
+ * Dispatches a "layoutNeeded" event
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
+ public function layoutNeeded():void
+ {
+ dispatchEvent( new Event("layoutNeeded") );
+ }
+
+ /**
* Returns the ILayoutHost which is its view. From ILayoutParent.
*
* @langversion 3.0
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d7fb6b1d/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/ControlBar.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/ControlBar.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/ControlBar.as
index 6aaa9d5..588bd8c 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/ControlBar.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/ControlBar.as
@@ -69,12 +69,12 @@ package org.apache.flex.html
*/
override public function addedToParent():void
{
+ super.addedToParent();
+
if( getBeadByType(IBeadLayout) == null ) {
var layout:IBeadLayout = new (ValuesManager.valuesImpl.getValue(this, "iBeadLayout")) as IBeadLayout;
addBead(layout);
}
-
- super.addedToParent();
}
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d7fb6b1d/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/DateChooser.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/DateChooser.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/DateChooser.as
index 460cd33..971ed75 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/DateChooser.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/DateChooser.as
@@ -48,10 +48,6 @@ package org.apache.flex.html
public function DateChooser()
{
super();
-
- // fix the DateChooser's size
- width = 280;
- height = 240;
// default to today
selectedDate = new Date();
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d7fb6b1d/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataGridPercentageView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataGridPercentageView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataGridPercentageView.as
index fcf9154..76365f3 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataGridPercentageView.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataGridPercentageView.as
@@ -116,8 +116,10 @@ package org.apache.flex.html.beads
_header = new DataGridButtonBar();
_header.height = 30;
+ _header.percentWidth = 100;
_listArea = new Container();
+ _listArea.percentWidth = 100;
_listArea.className = "DataGridListArea";
COMPILE::SWF {
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d7fb6b1d/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataGridView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataGridView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataGridView.as
index bda0f01..4103659 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataGridView.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataGridView.as
@@ -115,8 +115,10 @@ package org.apache.flex.html.beads
_header = new DataGridButtonBar();
_header.height = 30;
+ _header.percentWidth = 100;
_listArea = new Container();
+ _listArea.percentWidth = 100;
_listArea.className = "DataGridListArea";
COMPILE::SWF {
@@ -190,6 +192,9 @@ package org.apache.flex.html.beads
host.addElement(_listArea);
handleDataProviderChanged(event);
+
+ host.addEventListener("widthChanged", handleSizeChanges);
+ host.addEventListener("heightChanged", handleSizeChanges);
}
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d7fb6b1d/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForColumnData.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForColumnData.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForColumnData.as
index 3b50e05..64a2240 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForColumnData.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForColumnData.as
@@ -79,7 +79,7 @@ package org.apache.flex.html.beads
*/
private function finishSetup(event:Event):void
{
- selectionModel = value.getBeadByType(IDataGridModel) as IDataGridModel;
+ selectionModel = _strand.getBeadByType(IDataGridModel) as IDataGridModel;
selectionModel.addEventListener("dataProviderChanged", dataProviderChangeHandler);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d7fb6b1d/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DateChooserView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DateChooserView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DateChooserView.as
index 89877ab..ca1a0ee 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DateChooserView.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DateChooserView.as
@@ -117,6 +117,8 @@ package org.apache.flex.html.beads
return daysContainer;
}
+ private const controlHeight:int = 26;
+ private const commonButtonWidth:int = 40;
/**
* @private
@@ -126,7 +128,8 @@ package org.apache.flex.html.beads
// HEADER BUTTONS
monthButtonsContainer = new Group();
- monthButtonsContainer.id = "DateChooserMonthButtons";
+ monthButtonsContainer.height = controlHeight;
+ monthButtonsContainer.id = "dateChooserMonthButtons";
monthButtonsContainer.className = "DateChooserMonthButtons";
monthButtonsContainer.style = new SimpleCSSStyles();
monthButtonsContainer.style.flexGrow = 0;
@@ -135,7 +138,7 @@ package org.apache.flex.html.beads
}
_prevMonthButton = new DateHeaderButton();
- _prevMonthButton.width = 40;
+ _prevMonthButton.width = commonButtonWidth;
_prevMonthButton.text = "<";
if (_prevMonthButton.style == null) {
_prevMonthButton.style = new SimpleCSSStyles();
@@ -158,7 +161,7 @@ package org.apache.flex.html.beads
monthButtonsContainer.addElement(monthLabel);
_nextMonthButton = new DateHeaderButton();
- _nextMonthButton.width = 40;
+ _nextMonthButton.width = commonButtonWidth;
_nextMonthButton.text = ">";
if (_nextMonthButton.style == null) {
_nextMonthButton.style = new SimpleCSSStyles();
@@ -174,25 +177,33 @@ package org.apache.flex.html.beads
// DAY NAMES
dayNamesContainer = new DateChooserHeader();
- dayNamesContainer.id = "DateChooserDayNames";
- dayNamesContainer.percentWidth = 100;
+ dayNamesContainer.id = "dateChooserDayNames";
+ dayNamesContainer.className = "DateChooserHeader";
+ dayNamesContainer.height = controlHeight;
dayNamesContainer.style = new SimpleCSSStyles();
dayNamesContainer.style.flexGrow = 0;
COMPILE::JS {
dayNamesContainer.element.style["flex-grow"] = "0";
+ dayNamesContainer.element.style["align-items"] = "center";
+ }
+ COMPILE::SWF {
+ dayNamesContainer.percentWidth = 100;
}
UIBase(_strand).addElement(dayNamesContainer, false);
// DAYS
daysContainer = new DateChooserList();
- daysContainer.id = "DateChooserList";
- daysContainer.percentWidth = 100;
+ daysContainer.className = "DateChooserList";
+ daysContainer.id = "dateChooserList";
daysContainer.style = new SimpleCSSStyles();
daysContainer.style.flexGrow = 1;
COMPILE::JS {
daysContainer.element.style["flex-grow"] = "1";
}
+ COMPILE::SWF {
+ daysContainer.percentWidth = 100;
+ }
UIBase(_strand).addElement(daysContainer, false);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d7fb6b1d/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DateFieldView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DateFieldView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DateFieldView.as
index 6cd9478..33bdfbb 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DateFieldView.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DateFieldView.as
@@ -171,7 +171,7 @@ package org.apache.flex.html.beads
{
_popUp = new DateChooser();
_popUp.width = 210;
- _popUp.height = 220;
+ _popUp.height = 230;
}
var model:IDateChooserModel = _strand.getBeadByType(IDateChooserModel) as IDateChooserModel;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d7fb6b1d/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 d286b01..e4cab81 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
@@ -18,6 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html.beads
{
+ import org.apache.flex.core.BeadViewBase;
import org.apache.flex.core.IBead;
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.IBeadView;
@@ -26,11 +27,10 @@ package org.apache.flex.html.beads
import org.apache.flex.core.ILayoutView;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IUIBase;
- import org.apache.flex.core.BeadViewBase;
import org.apache.flex.core.UIBase;
import org.apache.flex.core.ValuesManager;
- import org.apache.flex.events.IEventDispatcher;
import org.apache.flex.events.Event;
+ import org.apache.flex.events.IEventDispatcher;
COMPILE::SWF {
import org.apache.flex.geom.Size;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d7fb6b1d/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 aec7308..cad6827 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
@@ -118,8 +118,8 @@ package org.apache.flex.html.beads.layouts
var childData:Array = [];
var hostWidthSizedToContent:Boolean = host.isWidthSizedToContent();
var hostHeightSizedToContent:Boolean = host.isHeightSizedToContent();
- var hostWidth:Number = hostWidthSizedToContent ? 0 : contentView.width;
- var hostHeight:Number = hostHeightSizedToContent ? 0 : contentView.height;
+ var hostWidth:Number = hostWidthSizedToContent ? host.width : contentView.width;
+ var hostHeight:Number = hostHeightSizedToContent ? host.height : contentView.height;
var ilc:ILayoutChild;
var data:Object;
@@ -215,7 +215,8 @@ package org.apache.flex.html.beads.layouts
ilc.setX(xpos + data.ml);
ilc.setY(ypos + data.mt);
if (data.height > 0) {
- ilc.height = useHeight; //setHeight(useHeight);
+ //ilc.height = useHeight;
+ ilc.setHeight(useHeight);
}
if (useWidth > 0) {
if (setWidth) ilc.setWidth(useWidth);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d7fb6b1d/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/TileLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/TileLayout.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/TileLayout.as
index 773bc4f..eb4b3c9 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/TileLayout.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/TileLayout.as
@@ -197,7 +197,6 @@ package org.apache.flex.html.beads.layouts
n = children.length;
if (n === 0) return false;
- contentView.width = host.width;
contentView.element.style["display"] = "flex";
contentView.element.style["flex-flow"] = "row wrap";
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d7fb6b1d/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 e41d9c4..f495acc 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
@@ -118,8 +118,8 @@ package org.apache.flex.html.beads.layouts
var childData:Array = [];
var hostWidthSizedToContent:Boolean = host.isWidthSizedToContent();
var hostHeightSizedToContent:Boolean = host.isHeightSizedToContent();
- var hostWidth:Number = hostWidthSizedToContent ? 0 : contentView.width;
- var hostHeight:Number = hostHeightSizedToContent ? 0 : contentView.height;
+ var hostWidth:Number = hostWidthSizedToContent ? host.width : contentView.width;
+ var hostHeight:Number = hostHeightSizedToContent ? host.height : contentView.height;
var ilc:ILayoutChild;
var data:Object;
@@ -192,9 +192,8 @@ package org.apache.flex.html.beads.layouts
{
child = contentView.getElementAt(i) as IUIBase;
data = childData[i];
- //if (data.width == 0 || data.height == 0) continue;
- useWidth = (data.width < 0 ? maxWidth : data.width);
+ useWidth = (data.width < 0 ? hostWidth : data.width);
var setHeight:Boolean = true;
if (data.height != 0) {
@@ -213,7 +212,8 @@ package org.apache.flex.html.beads.layouts
ilc.setX(xpos + data.ml);
ilc.setY(ypos + data.mt);
if (data.width > 0) {
- ilc.width = useWidth; //setWidth(useWidth);
+ //ilc.width = useWidth;
+ ilc.setWidth(useWidth);
}
if (useHeight > 0) {
if (setHeight) ilc.setHeight(useHeight);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d7fb6b1d/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 2a23422..640dda2 100644
--- a/frameworks/projects/HTML/src/main/resources/defaults.css
+++ b/frameworks/projects/HTML/src/main/resources/defaults.css
@@ -146,12 +146,11 @@ Container
ControlBar
{
IBeadView: ClassReference("org.apache.flex.html.beads.GroupView");
- IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.FlexibleFirstChildHorizontalLayout");
+ IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.HorizontalFlexLayout");
- background-color: #E2E2E2;
- border-style: solid;
- border-color: #333333;
- border-width: 1px;
+ padding: 2px;
+ background-color: #E2E2E2;
+ border-top: solid 1px #333333;
height: 30px;
}
@@ -399,10 +398,7 @@ Panel
IPanelLayout: ClassReference("org.apache.flex.html.beads.layouts.VerticalFlexLayout");
background-color: #FFFFFF;
- border-style: solid;
- border-color: #000000;
- border-width: 1px;
- padding: 2px;
+ border: solid 1px #333333
}
PanelWithControlBar
@@ -412,10 +408,12 @@ PanelWithControlBar
IPanelLayout: ClassReference("org.apache.flex.html.beads.layouts.VerticalFlexLayout");
background-color: #FFFFFF;
- border-style: solid;
- border-color: #000000;
- border-width: 1px;
- padding: 2px;
+ border: solid 1px #333333;
+}
+
+Panel .TitleBar
+{
+ border-bottom: solid 1px #333333;
}
SimpleList
@@ -492,9 +490,6 @@ TitleBar
IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.FlexibleFirstChildHorizontalLayout");
iMeasurementBead: ClassReference("org.apache.flex.html.beads.TitleBarMeasurementBead");
background-color: #E2E2E2;
- border-style: solid;
- border-color: #333333;
- border-width: 1px;
padding: 2px;
height: 30px;
flex-grow: 0;
@@ -627,7 +622,8 @@ global
{
IMeasurementBead: ClassReference("org.apache.flex.html.beads.ControlBarMeasurementBead");
IBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
- IBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+ IBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+ border: solid 1px #333333;
}
ComboBoxList {
@@ -849,6 +845,7 @@ global
{
IBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
IBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+ border: solid 1px #333333;
}
ToggleTextButton
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d7fb6b1d/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 2b7f43f..504f62e 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
@@ -22,13 +22,13 @@ package org.apache.flex.mobile
import org.apache.flex.core.IBeadController;
import org.apache.flex.core.IUIBase;
import org.apache.flex.core.ValuesManager;
- import org.apache.flex.html.Container;
+ import org.apache.flex.html.Group;
/**
* The TitleView class represents a view in a mobile app that has
* a title and is typically used in a ViewManager.
*/
- public class TitleView extends Container implements IViewManagerView
+ public class TitleView extends Group implements IViewManagerView
{
public function TitleView()
{