"layoutComplete" event now dispatched by GroupView rather than individual 
layouts. SWF-side border and background beads now listen for layout changes as 
another indicator they need to redraw.


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e3a883a8
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e3a883a8
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e3a883a8

Branch: refs/heads/tlf
Commit: e3a883a835c2287c8816ca0c53788cd88153dac2
Parents: 5300c4e
Author: Peter Ent <[email protected]>
Authored: Thu Mar 23 11:17:56 2017 -0400
Committer: Peter Ent <[email protected]>
Committed: Thu Mar 23 11:17:56 2017 -0400

----------------------------------------------------------------------
 .../flex/org/apache/flex/core/UIButtonBase.as   |  2 +-
 .../org/apache/flex/html/beads/ContainerView.as | 48 ++------------------
 .../apache/flex/html/beads/DropDownListView.as  |  1 +
 .../org/apache/flex/html/beads/GroupView.as     | 21 +++++++++
 .../flex/html/beads/SingleLineBorderBead.as     |  6 +--
 .../flex/html/beads/SolidBackgroundBead.as      |  9 ++--
 .../flex/html/beads/layouts/BasicLayout.as      |  3 --
 .../flex/html/beads/layouts/ButtonBarLayout.as  |  2 -
 .../FlexibleFirstChildHorizontalLayout.as       |  2 -
 .../html/beads/layouts/HorizontalFlexLayout.as  |  2 -
 .../html/beads/layouts/HorizontalFlowLayout.as  |  4 --
 .../flex/html/beads/layouts/HorizontalLayout.as |  4 +-
 .../layouts/OneFlexibleChildHorizontalLayout.as |  2 -
 .../layouts/OneFlexibleChildVerticalLayout.as   |  2 -
 .../flex/html/beads/layouts/TileLayout.as       |  2 -
 .../html/beads/layouts/VerticalFlexLayout.as    |  2 -
 .../flex/html/beads/layouts/VerticalLayout.as   |  4 +-
 .../HTML/src/main/resources/defaults.css        |  5 +-
 18 files changed, 40 insertions(+), 81 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3a883a8/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIButtonBase.as
----------------------------------------------------------------------
diff --git 
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIButtonBase.as 
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIButtonBase.as
index ef5c9a1..5c12a69 100644
--- 
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIButtonBase.as
+++ 
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIButtonBase.as
@@ -697,7 +697,7 @@ package org.apache.flex.core
             super.addBead(bead);
             if (bead is IBeadView)
                 _view = bead as IBeadView;
-                       bead.strand = this;
+                       //bead.strand = this; // super.addBead already did this!
                }
                
         /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3a883a8/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 81239a6..8d786a4 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
@@ -23,13 +23,13 @@ package org.apache.flex.html.beads
        import org.apache.flex.core.IBead;
        import org.apache.flex.core.IBeadLayout;
        import org.apache.flex.core.IBeadView;
-    import org.apache.flex.core.IChild;
+       import org.apache.flex.core.IChild;
        import org.apache.flex.core.IContainer;
        import org.apache.flex.core.IContainerView;
        import org.apache.flex.core.IContentViewHost;
        import org.apache.flex.core.ILayoutChild;
-       import org.apache.flex.core.ILayoutView;
        import org.apache.flex.core.ILayoutHost;
+       import org.apache.flex.core.ILayoutView;
        import org.apache.flex.core.IParent;
        import org.apache.flex.core.IParentIUIBase;
        import org.apache.flex.core.IStrand;
@@ -41,7 +41,7 @@ package org.apache.flex.html.beads
        import org.apache.flex.events.Event;
        import org.apache.flex.events.IEventDispatcher;
        import org.apache.flex.geom.Rectangle;
-    import org.apache.flex.geom.Size;
+       import org.apache.flex.geom.Size;
        import org.apache.flex.html.Container;
        import org.apache.flex.html.beads.models.ViewportModel;
        import org.apache.flex.html.supportClasses.Border;
@@ -223,7 +223,7 @@ package org.apache.flex.html.beads
                        var paddingMetrics:Rectangle = 
CSSContainerUtils.getPaddingMetrics(host);
                        return paddingMetrics;
                }
-
+               
                /**
                 *  Positions the viewport, then sets any known sizes of the 
Viewport prior
          *  to laying out its content.
@@ -233,7 +233,7 @@ package org.apache.flex.html.beads
                 *  @playerversion AIR 2.6
                 *  @productversion FlexJS 0.0
                 */
-               protected function layoutViewBeforeContentLayout():void
+               override protected function layoutViewBeforeContentLayout():void
                {
             var host:ILayoutChild = this.host as ILayoutChild;
             var vm:IViewportModel = viewportModel;
@@ -250,44 +250,6 @@ package org.apache.flex.html.beads
                }
 
                /**
-                * Executes the layout associated with this container. Once the 
layout has been
-                * run, it may affect the size of the host or may cause the 
host to present scroll
-                * bars view its viewport.
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion FlexJS 0.0
-                */
-               override protected function performLayout(event:Event):void
-               {
-                       if (layoutRunning) return;
-
-                       layoutRunning = true;
-
-                       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();
-                       }
-
-                       layoutViewAfterContentLayout();
-
-                       layoutRunning = false;
-               }
-
-               /**
                 * @private
                 */
                private var adjusting:Boolean = false;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3a883a8/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DropDownListView.as
----------------------------------------------------------------------
diff --git 
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DropDownListView.as
 
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DropDownListView.as
index f7d991a..459d718 100644
--- 
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DropDownListView.as
+++ 
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DropDownListView.as
@@ -193,6 +193,7 @@ package org.apache.flex.html.beads
                
         private function drawBorder(sprite:Sprite, color:uint, ww:Number, 
hh:Number):void
         {
+                       sprite.graphics.clear();
             SolidBorderUtil.drawBorder(sprite.graphics, 0, 0,
                 ww, hh,
                 0x808080, color, 1, 1, 4);

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3a883a8/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 170f59b..bd02408 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
@@ -230,6 +230,20 @@ package org.apache.flex.html.beads
 
                                performLayout(event);
                }
+               
+               /**
+                * Provides a place for pre-layout actions.
+                *
+                *  @langversion 3.0
+                *  @playerversion Flash 10.2
+                *  @playerversion AIR 2.6
+                *  @productversion FlexJS 0.8
+                */
+               COMPILE::SWF
+               protected function layoutViewBeforeContentLayout():void
+               {
+                       // This has no use for Group but is here so a subclass 
can override it.
+               }
 
                /**
                 * Executes the layout associated with this container. Once the 
layout has been
@@ -246,6 +260,11 @@ package org.apache.flex.html.beads
                        if (layoutRunning) return;
 
                        layoutRunning = true;
+                       
+                       COMPILE::SWF {
+                               // the HTML/JS side do not need any preparations
+                               layoutViewBeforeContentLayout();
+                       }
 
                        var host:UIBase = _strand as UIBase;
 
@@ -269,6 +288,8 @@ package org.apache.flex.html.beads
                        }
 
                        layoutRunning = false;
+                       
+                       host.dispatchEvent(new Event("layoutComplete"));
                }
 
                /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3a883a8/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SingleLineBorderBead.as
----------------------------------------------------------------------
diff --git 
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SingleLineBorderBead.as
 
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SingleLineBorderBead.as
index af31e24..8940893 100644
--- 
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SingleLineBorderBead.as
+++ 
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SingleLineBorderBead.as
@@ -65,11 +65,11 @@ package org.apache.flex.html.beads
                public function set strand(value:IStrand):void
                {
                        _strand = value;
-            IEventDispatcher(value).addEventListener("layoutNeeded", 
changeHandler);
             IEventDispatcher(value).addEventListener("heightChanged", 
changeHandler);
             IEventDispatcher(value).addEventListener("widthChanged", 
changeHandler);
-            IEventDispatcher(value).addEventListener("sizeChanged", 
changeHandler);
-            changeHandler(null);
+                       IEventDispatcher(value).addEventListener("sizeChanged", 
changeHandler);
+                       
IEventDispatcher(value).addEventListener("initComplete", changeHandler);
+                       
IEventDispatcher(value).addEventListener("layoutComplete", changeHandler);
                }
                        
                protected function changeHandler(event:Event):void

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3a883a8/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SolidBackgroundBead.as
----------------------------------------------------------------------
diff --git 
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SolidBackgroundBead.as
 
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SolidBackgroundBead.as
index 6ea9701..331003a 100644
--- 
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SolidBackgroundBead.as
+++ 
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SolidBackgroundBead.as
@@ -77,10 +77,9 @@ package org.apache.flex.html.beads
             IEventDispatcher(host).addEventListener("widthChanged", 
changeHandler);
                        IEventDispatcher(host).addEventListener("sizeChanged", 
changeHandler);
                        IEventDispatcher(host).addEventListener("initComplete", 
changeHandler);
+                       
IEventDispatcher(host).addEventListener("layoutComplete", changeHandler);
                        
                        setupStyle();
-            
-            changeHandler(null);
                }
                
                protected function setupStyle():void
@@ -91,17 +90,17 @@ package org.apache.flex.html.beads
                                opacity = 0;
                        }
                        else if( bgColor != null ) {
-                               backgroundColor = 
ValuesManager.valuesImpl.convertColor(bgColor);
+                               _backgroundColor = 
ValuesManager.valuesImpl.convertColor(bgColor);
                        }
                        
                        var bgAlpha:Object = 
ValuesManager.valuesImpl.getValue(host, "opacity");
                        if( bgAlpha != null ) {
-                               opacity = Number(bgAlpha);
+                               _opacity = Number(bgAlpha);
                        }
                        
                        var corner:Object = 
ValuesManager.valuesImpl.getValue(host, "border-radius");
                        if( corner != null ) {
-                               borderRadius = Number(corner);
+                               _borderRadius = Number(corner);
                        }
                }
                

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3a883a8/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/BasicLayout.as
----------------------------------------------------------------------
diff --git 
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/BasicLayout.as
 
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/BasicLayout.as
index 7349bf3..3aad370 100644
--- 
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/BasicLayout.as
+++ 
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/BasicLayout.as
@@ -204,8 +204,6 @@ package org.apache.flex.html.beads.layouts
                                        }
                 }
 
-                host.dispatchEvent( new Event("layoutComplete") );
-
                 return true;
 
             }
@@ -231,7 +229,6 @@ package org.apache.flex.html.beads.layouts
                                        child.positioner.style.position = 
"absolute";
                                }
 
-                               host.dispatchEvent( new Event("layoutComplete") 
);
                 return true;
             }
                }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3a883a8/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 a080035..4771942 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
@@ -175,8 +175,6 @@ package org.apache.flex.html.beads.layouts
                                xpos += UIBase(ir).width;
                        }
 
-                       IEventDispatcher(_strand).dispatchEvent( new 
Event("layoutComplete") );
-
             return true;
                }
        }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3a883a8/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
----------------------------------------------------------------------
diff --git 
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
 
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
index 66a8533..c82cab5 100644
--- 
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
+++ 
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
@@ -224,8 +224,6 @@ package org.apache.flex.html.beads.layouts
                                xpos -= ml;
                        }
 
-                       host.dispatchEvent( new Event("layoutComplete") );
-
                        return true;
                }
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3a883a8/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 1681e00..473bfe3 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
@@ -244,8 +244,6 @@ package org.apache.flex.html.beads.layouts
                                        //trace("HorizontalFlexLayout: setting 
child "+i+" to "+child.width+" x "+child.height+" at "+child.x+", "+child.y);
                                }
 
-                               IEventDispatcher(host).dispatchEvent( new 
Event("layoutComplete") );
-
                                //trace("HorizontalFlexLayout: complete");
 
                                return true;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3a883a8/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalFlowLayout.as
----------------------------------------------------------------------
diff --git 
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalFlowLayout.as
 
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalFlowLayout.as
index e492597..8209278 100644
--- 
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalFlowLayout.as
+++ 
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalFlowLayout.as
@@ -226,8 +226,6 @@ package org.apache.flex.html.beads.layouts
                                        xpos += childWidth + columnGap;
                                }
 
-                               IEventDispatcher(_strand).dispatchEvent( new 
Event("layoutComplete") );
-
                                return true;
                        }
                        COMPILE::JS
@@ -280,8 +278,6 @@ package org.apache.flex.html.beads.layouts
                                        children[i].style["margin-right"] = 
String(_columnGap/2)+"px";
                                }
 
-                               IEventDispatcher(_strand).dispatchEvent( new 
Event("layoutComplete") );
-
                                return true;
                        }
                }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3a883a8/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalLayout.as
----------------------------------------------------------------------
diff --git 
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalLayout.as
 
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalLayout.as
index 0192174..44f60bd 100644
--- 
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalLayout.as
+++ 
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalLayout.as
@@ -184,8 +184,6 @@ package org.apache.flex.html.beads.layouts
                                        xpos += child.width + mr;
                                }
 
-                               host.dispatchEvent( new Event("layoutComplete") 
);
-
                                return true;
 
             }
@@ -214,7 +212,7 @@ package org.apache.flex.html.beads.layouts
                                                child.style.display = 
'inline-block';
                                        }
                                }
-                               host.dispatchEvent( new Event("layoutComplete") 
);
+
                 return true;
             }
                }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3a883a8/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as
----------------------------------------------------------------------
diff --git 
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as
 
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as
index 7a41bbc..c163807 100644
--- 
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as
+++ 
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as
@@ -351,8 +351,6 @@ package org.apache.flex.html.beads.layouts
                                }
                        }
 
-                       host.dispatchEvent( new Event("layoutComplete") );
-
             return true;
                }
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3a883a8/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
----------------------------------------------------------------------
diff --git 
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
 
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
index 45c6253..21d9059 100644
--- 
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
+++ 
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
@@ -352,8 +352,6 @@ package org.apache.flex.html.beads.layouts
                                }
                        }
 
-                       host.dispatchEvent( new Event("layoutComplete") );
-
                        return true;
                }
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3a883a8/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 11e5b97..8f3c265 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
@@ -194,8 +194,6 @@ package org.apache.flex.html.beads.layouts
                                // size is stored in the model.
                                var sizeChanged:Boolean = true;
 
-                               IEventDispatcher(_strand).dispatchEvent( new 
Event("layoutComplete") );
-
                                return sizeChanged;
                        }
                        COMPILE::JS

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3a883a8/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 cee8416..e8d9a41 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
@@ -243,8 +243,6 @@ package org.apache.flex.html.beads.layouts
                                        //trace("VerticalFlexLayout: setting 
child "+i+" to "+child.width+" x "+child.height+" at "+child.x+", "+child.y);
                                }
 
-                               IEventDispatcher(host).dispatchEvent( new 
Event("layoutComplete") );
-
                                //trace("VerticalFlexLayout: complete");
 
                                return true;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3a883a8/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VerticalLayout.as
----------------------------------------------------------------------
diff --git 
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VerticalLayout.as
 
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VerticalLayout.as
index 48679cb..ca442d9 100644
--- 
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VerticalLayout.as
+++ 
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VerticalLayout.as
@@ -177,8 +177,6 @@ package org.apache.flex.html.beads.layouts
                                        ypos += child.height + mb;
                                }
 
-                               host.dispatchEvent( new Event("layoutComplete") 
);
-
                                return true;
                        }
                        COMPILE::JS
@@ -207,7 +205,7 @@ package org.apache.flex.html.beads.layouts
                                        }
                                        
child.flexjs_wrapper.dispatchEvent('sizeChanged');
                                }
-                               host.dispatchEvent( new Event("layoutComplete") 
);
+
                                return true;
                        }
                }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e3a883a8/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 211822d..e7f211d 100644
--- a/frameworks/projects/HTML/src/main/resources/defaults.css
+++ b/frameworks/projects/HTML/src/main/resources/defaults.css
@@ -661,10 +661,11 @@ global
                IItemRendererClassFactory: 
ClassReference("org.apache.flex.core.ItemRendererClassFactory");
                IItemRenderer: 
ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
                iBackgroundBead: 
ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
-               iBackgroundBead: 
ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
+               iBorderBead: 
ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
+               iBorderModel: 
ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
                border-style: solid;
                border-radius: 4px;
-               border-color: #000000;
+               border-color: #333333;
                border-width: 1px;
                background-color: #FFFFFF;
        }

Reply via email to