From commits-return-5391-archive-asf-public=cust-asf.ponee.io@royale.apache.org Sun Sep 2 10:57:34 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 92E731807A6 for ; Sun, 2 Sep 2018 10:57:33 +0200 (CEST) Received: (qmail 94572 invoked by uid 500); 2 Sep 2018 08:57:32 -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 94448 invoked by uid 99); 2 Sep 2018 08:57:32 -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; Sun, 02 Sep 2018 08:57:32 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 91C0285297; Sun, 2 Sep 2018 08:57:31 +0000 (UTC) Date: Sun, 02 Sep 2018 08:57:38 +0000 To: "commits@royale.apache.org" Subject: [royale-asjs] 08/14: Wrong DataGridColumn reference MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: harbs@apache.org In-Reply-To: <153587865082.13674.10773521844086541322@gitbox.apache.org> References: <153587865082.13674.10773521844086541322@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: royale-asjs X-Git-Refname: refs/heads/feature/Merge_MXRoyale_To_Develop X-Git-Reftype: branch X-Git-Rev: 899a49c6a10a7e2ef15c2573fab48a5491020ecc X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180902085731.91C0285297@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. harbs pushed a commit to branch feature/Merge_MXRoyale_To_Develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git commit 899a49c6a10a7e2ef15c2573fab48a5491020ecc Author: Harbs AuthorDate: Thu Jul 19 15:23:36 2018 +0300 Wrong DataGridColumn reference Added ignores --- .../royale/express/beads/layouts/DataGridLayout.as | 33 +++++++++++++++++----- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/frameworks/projects/Express/src/main/royale/org/apache/royale/express/beads/layouts/DataGridLayout.as b/frameworks/projects/Express/src/main/royale/org/apache/royale/express/beads/layouts/DataGridLayout.as index 08a563d..66ab8d9 100644 --- a/frameworks/projects/Express/src/main/royale/org/apache/royale/express/beads/layouts/DataGridLayout.as +++ b/frameworks/projects/Express/src/main/royale/org/apache/royale/express/beads/layouts/DataGridLayout.as @@ -23,12 +23,14 @@ package org.apache.royale.express.beads.layouts import org.apache.royale.core.IDataGridModel; import org.apache.royale.core.IStrand; import org.apache.royale.core.IUIBase; + import org.apache.royale.core.ILayoutChild; + import org.apache.royale.core.IParent; import org.apache.royale.core.UIBase; import org.apache.royale.core.ValuesManager; import org.apache.royale.core.layout.EdgeData; import org.apache.royale.events.Event; import org.apache.royale.events.IEventDispatcher; - import org.apache.royale.express.supportClasses.DataGridColumn; + import org.apache.royale.html.supportClasses.DataGridColumn; import org.apache.royale.geom.Rectangle; import org.apache.royale.html.beads.IDataGridView; import org.apache.royale.html.beads.IDrawingLayerBead; @@ -65,6 +67,7 @@ package org.apache.royale.express.beads.layouts * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion Royale 0.0 + * @royaleignorecoercion org.apache.royale.events.IEventDispatcher */ public function set strand(value:IStrand):void { @@ -76,10 +79,17 @@ package org.apache.royale.express.beads.layouts (_strand as IEventDispatcher).addEventListener("layoutNeeded", handleLayoutNeeded); } + /** + * @royaleignorecoercion org.apache.royale.core.IUIBase + */ private function get host():IUIBase { return _strand as IUIBase; } + + /** + * @royaleignorecoercion org.apache.royale.core.UIBase + */ private function get uiHost():UIBase { return _strand as UIBase; @@ -101,7 +111,16 @@ package org.apache.royale.express.beads.layouts * been placed. For example, with three columns of widths, "50", "100%", and "80" the * 100% size represents the amount left over after the 130 pixels have been removed from * whatever width the DataGrid currently has at the time this layout is executed. - * @royaleignorecoercion org.apache.royale.core.IBorderPaddingMarginValuesImpl + * + * @royaleignorecoercion org.apache.royale.core.IBorderPaddingMarginValuesImpl + * @royaleignorecoercion org.apache.royale.core.IUIBase + * @royaleignorecoercion org.apache.royale.core.IParent + * @royaleignorecoercion org.apache.royale.core.ILayoutChild + * @royaleignorecoercion org.apache.royale.html.beads.IDataGridView + * @royaleignorecoercion org.apache.royale.core.IDataGridModel + * @royaleignorecoercion org.apache.royale.html.supportClasses.DataGridColumn + * @royaleignorecoercion org.apache.royale.html.beads.models.ButtonBarModel + * @royaleignorecoercion org.apache.royale.html.beads.IDrawingLayerBead */ public function layout():Boolean { @@ -131,7 +150,7 @@ package org.apache.royale.express.beads.layouts for(i=0; i < displayedColumns.length; i++) { columnDef = model.columns[i] as DataGridColumn; - var columnList:UIBase = displayedColumns[i] as UIBase; + var columnList:IUIBase = displayedColumns[i] as IUIBase; // probably do not need to set (x,y), but if the Container's layout requires it, they will be set. columnList.x = xpos; @@ -160,7 +179,7 @@ package org.apache.royale.express.beads.layouts header.width = useWidth; } COMPILE::JS { - (header as UIBase).percentWidth = 100; + (header as ILayoutChild).percentWidth = 100; } // header's height is set in CSS @@ -170,7 +189,7 @@ package org.apache.royale.express.beads.layouts listArea.width = useWidth; } COMPILE::JS { - (listArea as UIBase).percentWidth = 100; + (listArea as ILayoutChild).percentWidth = 100; } listArea.height = useHeight - header.height; @@ -180,8 +199,8 @@ package org.apache.royale.express.beads.layouts // Put the drawing layer back, sizing it to fit over the listArea. if (layerBead != null && layerBead.layer != null) { - UIBase(_strand).removeElement(layerBead.layer); - UIBase(_strand).addElement(layerBead.layer); // always keep it on top + IParent(_strand).removeElement(layerBead.layer); + IParent(_strand).addElement(layerBead.layer); // always keep it on top var layerX:Number = listArea.x; var layerY:Number = listArea.y;