You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by al...@apache.org on 2021/01/05 13:15:29 UTC
[royale-asjs] branch develop updated: controlBarContent and
ControlBarLayout added in spark Panel
This is an automated email from the ASF dual-hosted git repository.
alinakazi pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 8b6b3d5 controlBarContent and ControlBarLayout added in spark Panel
8b6b3d5 is described below
commit 8b6b3d5e029a07e2bbea9e4054211cd872054213
Author: alinakazi <al...@gmail.com>
AuthorDate: Tue Jan 5 18:15:15 2021 +0500
controlBarContent and ControlBarLayout added in spark Panel
---
.../src/main/royale/spark/components/Panel.as | 37 +++++++++++-----------
1 file changed, 18 insertions(+), 19 deletions(-)
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/Panel.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/Panel.as
index a64d1b5..39c7cfe 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/Panel.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/Panel.as
@@ -35,8 +35,7 @@ import org.apache.royale.events.ValueEvent;
//import mx.utils.BitFlagUtil;
//import spark.core.IDisplayText;
-//import spark.layouts.supportClasses.LayoutBase;
-
+import spark.layouts.supportClasses.LayoutBase;
use namespace mx_internal;
//--------------------------------------
@@ -295,7 +294,7 @@ public class Panel extends SkinnableContainer
* controlBarGroupProperties stores booleans as to whether these properties
* have been explicitely set or not.
*/
- // mx_internal var controlBarGroupProperties:Object = { visible: true };
+ mx_internal var controlBarGroupProperties:Object = { visible: true };
//--------------------------------------------------------------------------
//
@@ -307,7 +306,7 @@ public class Panel extends SkinnableContainer
// controlBarGroup
//----------------------------------
- // [SkinPart(required="false")]
+ [SkinPart(required="false")]
/**
* The skin part that defines the appearance of the
@@ -322,7 +321,7 @@ public class Panel extends SkinnableContainer
* @playerversion AIR 1.5
* @productversion Royale 0.9.4
*/
- // public var controlBarGroup:Group;
+ public var controlBarGroup:Group;
//----------------------------------
// titleField
@@ -371,7 +370,7 @@ public class Panel extends SkinnableContainer
// controlBarContent
//----------------------------------
- //[ArrayElementType("mx.core.IVisualElement")]
+ [ArrayElementType("mx.core.IVisualElement")]
/**
* The set of components to include in the control bar area of the
@@ -391,30 +390,30 @@ public class Panel extends SkinnableContainer
* @playerversion AIR 1.5
* @productversion Royale 0.9.4
*/
- /* public function get controlBarContent():Array
+ public function get controlBarContent():Array
{
if (controlBarGroup)
return controlBarGroup.getMXMLContent();
else
return controlBarGroupProperties.controlBarContent;
- } */
+ }
/**
* @private
*/
- /* public function set controlBarContent(value:Array):void
+ public function set controlBarContent(value:Array):void
{
if (controlBarGroup)
{
controlBarGroup.mxmlContent = value;
- controlBarGroupProperties = BitFlagUtil.update(controlBarGroupProperties as uint,
- CONTROLBAR_PROPERTY_FLAG, value != null);
+ // controlBarGroupProperties = BitFlagUtil.update(controlBarGroupProperties as uint,
+ // CONTROLBAR_PROPERTY_FLAG, value != null);
}
else
controlBarGroupProperties.controlBarContent = value;
invalidateSkinState();
- } */
+ }
//----------------------------------
// controlBarLayout
@@ -430,27 +429,27 @@ public class Panel extends SkinnableContainer
* @playerversion AIR 1.5
* @productversion Royale 0.9.4
*/
- /* public function get controlBarLayout():LayoutBase
+ public function get controlBarLayout():LayoutBase
{
return (controlBarGroup)
- ? controlBarGroup.layout
+ ? controlBarGroup.layout as spark.layouts.supportClasses.LayoutBase
: controlBarGroupProperties.layout;
- } */
+ }
/**
* @private
*/
- /* public function set controlBarLayout(value:LayoutBase):void
+ public function set controlBarLayout(value:LayoutBase):void
{
if (controlBarGroup)
{
controlBarGroup.layout = value;
- controlBarGroupProperties = BitFlagUtil.update(controlBarGroupProperties as uint,
- LAYOUT_PROPERTY_FLAG, true);
+ // controlBarGroupProperties = BitFlagUtil.update(controlBarGroupProperties as uint,
+ // LAYOUT_PROPERTY_FLAG, true);
}
else
controlBarGroupProperties.layout = value;
- } */
+ }
//----------------------------------
// controlBarVisible