Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id DAD03200C03 for ; Sat, 7 Jan 2017 00:55:19 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id D95FF160B49; Fri, 6 Jan 2017 23:55:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 30856160B39 for ; Sat, 7 Jan 2017 00:55:19 +0100 (CET) Received: (qmail 63396 invoked by uid 500); 6 Jan 2017 23:55:18 -0000 Mailing-List: contact commits-help@flex.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flex.apache.org Delivered-To: mailing list commits@flex.apache.org Received: (qmail 63383 invoked by uid 99); 6 Jan 2017 23:55:18 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jan 2017 23:55:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4F3BADF9FD; Fri, 6 Jan 2017 23:55:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: piotrz@apache.org To: commits@flex.apache.org Date: Fri, 06 Jan 2017 23:55:18 -0000 Message-Id: <486279397b0546b9b2153791cf8b5976@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/5] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Fix for bug FLEX-35237. Apply supplied patch with minor changes. archived-at: Fri, 06 Jan 2017 23:55:20 -0000 Repository: flex-asjs Updated Branches: refs/heads/feature/fontawesome 4818e6d83 -> b516503be Fix for bug FLEX-35237. Apply supplied patch with minor changes. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/81cbd002 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/81cbd002 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/81cbd002 Branch: refs/heads/feature/fontawesome Commit: 81cbd002fd6c12e97d719ea92a5a4eb5bf42d70c Parents: b7a833d Author: Peter Ent Authored: Thu Jan 5 09:30:54 2017 -0500 Committer: Peter Ent Committed: Thu Jan 5 09:30:54 2017 -0500 ---------------------------------------------------------------------- .../flex/html/beads/layouts/DataGridLayout.as | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/81cbd002/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as index 1d22956..a3bd4e8 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as @@ -18,6 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.html.beads.layouts { + import org.apache.flex.core.IBead; import org.apache.flex.core.IBeadLayout; import org.apache.flex.core.IBeadModel; import org.apache.flex.core.IBeadView; @@ -71,16 +72,23 @@ package org.apache.flex.html.beads.layouts { _strand = value; - var host:UIBase = _strand as UIBase; - host.addEventListener("widthChanged", handleSizeChanges); - host.addEventListener("heightChanged", handleSizeChanges); - host.addEventListener("sizeChanged", handleSizeChanges); - host.addEventListener("layoutNeeded", handleSizeChanges); + var host:UIBase = value as UIBase; var view:DataGridView = host.view as DataGridView; + header = view.header; listArea = view.listArea; + + var anylayout:IBead = listArea.getBeadByType(IBeadLayout); + if (anylayout != null) { + listArea.removeBead(anylayout); + } listArea.addBead(new BasicLayout()); + + host.addEventListener("widthChanged", handleSizeChanges); + host.addEventListener("heightChanged", handleSizeChanges); + host.addEventListener("sizeChanged", handleSizeChanges); + host.addEventListener("layoutNeeded", handleSizeChanges); } private var _header:UIBase;