From commits-return-4610-archive-asf-public=cust-asf.ponee.io@royale.apache.org Fri Jun 29 02:46:09 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id D1EFD1807A3 for ; Fri, 29 Jun 2018 02:46:08 +0200 (CEST) Received: (qmail 2019 invoked by uid 500); 29 Jun 2018 00:46:07 -0000 Mailing-List: contact commits-help@royale.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@royale.apache.org Delivered-To: mailing list commits@royale.apache.org Received: (qmail 1933 invoked by uid 99); 29 Jun 2018 00:46:07 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Jun 2018 00:46:07 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 97833850C8; Fri, 29 Jun 2018 00:46:06 +0000 (UTC) Date: Fri, 29 Jun 2018 00:46:13 +0000 To: "commits@royale.apache.org" Subject: [royale-asjs] 07/13: get mxtests to run on SWF MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: aharui@apache.org In-Reply-To: <153023316618.21628.7990695329131844627@gitbox.apache.org> References: <153023316618.21628.7990695329131844627@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: royale-asjs X-Git-Refname: refs/heads/feature/MXRoyale X-Git-Reftype: branch X-Git-Rev: e1cd87f5da630b493005d0b0c521fff90bff12cb X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180629004606.97833850C8@gitbox.apache.org> 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 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; + } }