royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [royale-asjs] 07/13: get mxtests to run on SWF
Date Fri, 29 Jun 2018 00:46:13 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit e1cd87f5da630b493005d0b0c521fff90bff12cb
Author: Alex Harui <aharui@apache.org>
AuthorDate: Wed Jun 27 19:20:39 2018 -0700

    get mxtests to run on SWF
---
 .../src/main/royale/mx/core/UIComponent.as         | 24 +++++++++++++---------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
index 01af597..9943aa5 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
@@ -719,8 +719,7 @@ public class UIComponent extends UIBase
      *  @playerversion AIR 1.1
      *  @productversion Flex 3
      */
-    COMPILE::SWF
-    { override }
+    COMPILE::JS
     public function get mouseEnabled():Boolean
     {
         if (GOOG::DEBUG)
@@ -728,8 +727,7 @@ public class UIComponent extends UIBase
         return false;
     }
     
-    COMPILE::SWF
-    { override }
+    COMPILE::JS
     public function set mouseEnabled(value:Boolean):void
     {
         if (GOOG::DEBUG)
@@ -744,8 +742,7 @@ public class UIComponent extends UIBase
      *  @playerversion AIR 1.1
      *  @productversion Flex 3
      */
-    COMPILE::SWF
-    { override }
+    COMPILE::JS
     public function get mouseChildren():Boolean
     {
         if (GOOG::DEBUG)
@@ -753,8 +750,7 @@ public class UIComponent extends UIBase
         return false;
     }
     
-    COMPILE::SWF
-    { override }
+    COMPILE::JS
     public function set mouseChildren(value:Boolean):void
     {
         if (GOOG::DEBUG)
@@ -3476,8 +3472,16 @@ public class UIComponent extends UIBase
     {
         measuredMinWidth = 0;
         measuredMinHeight = 0;
-        measuredWidth = 0;
-        measuredHeight = 0;
+        COMPILE::JS
+        {
+            measuredWidth = 0;
+            measuredHeight = 0;
+        }
+        COMPILE::SWF
+        {
+            measuredWidth = $width;
+            measuredHeight = $height;            
+        }
     }
 
 


Mime
View raw message