You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2018/09/05 06:25:50 UTC
[royale-asjs] branch feature/new_merge updated: removed
getDisplayStyleForLayout and made displayStyleForLayout public
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch feature/new_merge
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/feature/new_merge by this push:
new a17d779 removed getDisplayStyleForLayout and made displayStyleForLayout public
a17d779 is described below
commit a17d7796284afaf0cb57321f5ff1ac60a7389526
Author: Harbs <ha...@in-tools.com>
AuthorDate: Wed Sep 5 09:25:42 2018 +0300
removed getDisplayStyleForLayout and made displayStyleForLayout public
---
.../Basic/src/main/royale/org/apache/royale/core/UIBase.as | 12 ++++++------
.../org/apache/royale/html/beads/layouts/VerticalLayout.as | 2 +-
.../apache/royale/html/supportClasses/PanelLayoutProxy.as | 8 ++++++++
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
index a3d3c45..c3d8356 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
@@ -842,9 +842,12 @@ package org.apache.royale.core
dispatchEvent(new Event(value?"show":"hide"));
dispatchEvent(new Event("visibleChanged"));
}
-
+ /**
+ * @private
+ * @royalesuppresspublicvarwarning
+ */
COMPILE::JS
- protected var displayStyleForLayout:String;
+ public var displayStyleForLayout:String;
/**
* The display style is used for both visible
@@ -862,10 +865,7 @@ package org.apache.royale.core
if (positioner.style.display !== 'none')
positioner.style.display = value;
}
- COMPILE::JS
- public function getDisplayStyleForLayout():String{
- return displayStyleForLayout;
- }
+
[Bindable("visibleChanged")]
COMPILE::JS
public function get visible():Boolean
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/VerticalLayout.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/VerticalLayout.as
index f96b978..aa11d93 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/VerticalLayout.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/VerticalLayout.as
@@ -169,7 +169,7 @@ package org.apache.royale.html.beads.layouts
{
var child:WrappedHTMLElement = children[i] as WrappedHTMLElement;
if (child == null) continue;
- if(!child.royale_wrapper.getDisplayStyleForLayout())
+ if(!child.royale_wrapper.displayStyleForLayout)
{
if (!child.royale_wrapper.visible)
{
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/PanelLayoutProxy.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/PanelLayoutProxy.as
index c7a4d87..b2c5520 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/PanelLayoutProxy.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/PanelLayoutProxy.as
@@ -224,6 +224,14 @@ package org.apache.royale.html.supportClasses
{
(host as UIBase).setDisplayStyleForLayout(value);
}
+ /**
+ * @royaleignorecoercion org.apache.royale.core.UIBase
+ */
+ COMPILE::JS
+ public function get displayStyleForLayout():String
+ {
+ return (host as UIBase).displayStyleForLayout;
+ }
}
}