[royale-asjs] 02/02: Fixes #1116

[yishayw]

This is an automated email from the ASF dual-hosted git repository.

yishayw pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit b74e1c6b0225eb0e0e279319fd7c3484ddf1da08
Author: Yishay Weiss <yishayj...@hotmail.com>
AuthorDate: Wed Jun 16 11:06:39 2021 +0300

    Fixes #1116
---
 .../MXRoyale/src/main/royale/mx/containers/TabNavigator.as   | 12 ++++++++----
 .../src/main/royale/mx/containers/beads/TabNavigatorView.as  |  8 ++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git 
a/frameworks/projects/MXRoyale/src/main/royale/mx/containers/TabNavigator.as 
b/frameworks/projects/MXRoyale/src/main/royale/mx/containers/TabNavigator.as
index 769439a..74f9d10 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/containers/TabNavigator.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/containers/TabNavigator.as
@@ -23,6 +23,7 @@ package mx.containers
 import mx.containers.beads.TabNavigatorView;
 import mx.controls.Button;
 import mx.core.Container;
+import mx.core.UIComponent;
 import mx.core.EdgeMetrics;
 import mx.managers.IFocusManagerComponent;
 import mx.controls.TabBar;
@@ -415,12 +416,15 @@ public class TabNavigator extends ViewStack implements 
IFocusManagerComponent
      *  @productversion Flex 3
      */
     protected var tabBar:TabBar;
+
+    /**
+     * @royaleignorecoercion mx.controls.Button
+     */
     public function getTabAt(index:int):Button
     {
-        // TODO
-        //trace("cacheAsBitmap not implemented");
-        //return null;
-               return Button(tabBar.getChildAt(index));
+        // TODO make sure a real mx.controls.Button is returned instead of 
Basic's TextButtonItemRenderer
+
+               return ((view as TabNavigatorView).tabBar as 
UIComponent).getChildAt(index) as Button;
     }
 
     
diff --git 
a/frameworks/projects/MXRoyale/src/main/royale/mx/containers/beads/TabNavigatorView.as
 
b/frameworks/projects/MXRoyale/src/main/royale/mx/containers/beads/TabNavigatorView.as
index 96d3474..c19c7b1 100644
--- 
a/frameworks/projects/MXRoyale/src/main/royale/mx/containers/beads/TabNavigatorView.as
+++ 
b/frameworks/projects/MXRoyale/src/main/royale/mx/containers/beads/TabNavigatorView.as
@@ -124,10 +124,6 @@ public class TabNavigatorView extends GroupView
         tabBar.percentWidth = 100;
         tabBar.addEventListener("change", tabChangeHandler);
         addEventListener("change", tabChangeHandler);
-        if (tabBar.parent == null) {
-            (_strand as IContainerBaseStrandChildrenHost).$addElement(tabBar);
-        }
-            
         if (!_contentArea) {
             var cls:Class = ValuesManager.valuesImpl.getValue(_strand, 
"iTabNavigatorContentArea");
             var viewportClass:Class = 
ValuesManager.valuesImpl.getValue(_strand, "iViewport");
@@ -139,6 +135,10 @@ public class TabNavigatorView extends GroupView
             _contentArea.id = "tabNavigatorContent";
             _contentArea.typeNames = "TabNavigatorContent";
         }
+
+        if (tabBar.parent == null) {
+            (_strand as IContainerBaseStrandChildrenHost).$addElement(tabBar);
+        }
         contentArea.percentWidth = 100;
         contentArea.percentHeight = 100;
         // try to listen for childrenAdded before ViewStackLayout listens for 
childrenAdded