You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2020/03/11 04:15:03 UTC
[royale-asjs] branch develop updated: let owns/contains work for
IUIBase
This is an automated email from the ASF dual-hosted git repository.
aharui 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 035cca6 let owns/contains work for IUIBase
035cca6 is described below
commit 035cca645250397b87a23880191e54c9a79aeed6
Author: Alex Harui <ah...@apache.org>
AuthorDate: Tue Mar 10 20:57:08 2020 -0700
let owns/contains work for IUIBase
---
frameworks/projects/MXRoyale/src/main/royale/mx/charts/Legend.as | 8 +++++---
.../MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as | 2 +-
.../advancedDataGridClasses/AdvancedDataGridItemRenderer.as | 3 ++-
.../projects/MXRoyale/src/main/royale/mx/core/IChildList.as | 3 ++-
.../projects/MXRoyale/src/main/royale/mx/core/UIComponent.as | 6 +++---
5 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/Legend.as b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/Legend.as
index 8d4927d..9e7536d 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/Legend.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/Legend.as
@@ -63,6 +63,7 @@ package mx.charts
import mx.styles.IStyleClient;
// import mx.styles.StyleProtoChain;
+ import org.apache.royale.core.IUIBase;
import org.apache.royale.events.Event;
import mx.events.KeyboardEvent;
import org.apache.royale.events.MouseEvent;
@@ -3178,7 +3179,7 @@ package mx.charts
* @private
*/
[SWFOverride(params="flash.display.DisplayObject", altparams="mx.core.UIComponent"))]
- override public function contains(child:IUIComponent):Boolean
+ override public function contains(child:IUIBase):Boolean
{
if (contentPane)
return contentPane.contains(child);
@@ -5016,7 +5017,7 @@ package mx.charts
* so in order to implement the rawChildren property we need
* a parallel method that deals with all children.
*/
- mx_internal function rawChildren_contains(child:IUIComponent):Boolean
+ mx_internal function rawChildren_contains(child:IUIBase):Boolean
{
return super.contains(child);
}
@@ -6576,6 +6577,7 @@ package mx.charts
import mx.core.IUIComponent;
+import org.apache.royale.core.IUIBase;
import org.apache.royale.geom.Point;
import mx.charts.Legend;
@@ -6774,7 +6776,7 @@ class LegendRawChildrenList implements IChildList
/**
* @private
*/
- public function contains(child:IUIComponent):Boolean
+ public function contains(child:IUIBase):Boolean
{
return owner.rawChildren_contains(child);
}
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as
index 67116d6..af71475 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as
@@ -10900,7 +10900,7 @@ public class AdvancedDataGrid extends AdvancedListBase implements IDataGrid
*/
private function editorMouseDownHandler(event:Event):void
{
- if(event is MouseEvent && owns(event.target as IUIComponent))
+ if(event is MouseEvent && owns(event.target as IUIBase))
return;
endEdit(AdvancedDataGridEventReason.OTHER);
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridItemRenderer.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridItemRenderer.as
index e41dfff..e4478e2 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridItemRenderer.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridItemRenderer.as
@@ -53,6 +53,7 @@ import mx.collections.IHierarchicalData;
import mx.events.ListEvent;
import org.apache.royale.core.ISelectableItemRenderer;
import org.apache.royale.core.IListDataItemRenderer;
+import org.apache.royale.core.IUIBase;
import org.apache.royale.geom.Point;
import org.apache.royale.utils.getSelectionRenderBead;
import org.apache.royale.utils.PointUtils;
@@ -983,7 +984,7 @@ public class AdvancedDataGridItemRenderer extends StringItemRenderer
[SWFOverride(params="flash.display.DisplayObject", altparams="mx.core.UIComponent"))]
COMPILE::SWF
{ override }
- public function contains(child:IUIComponent):Boolean
+ public function contains(child:IUIBase):Boolean
{
return child == this;
}
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/core/IChildList.as b/frameworks/projects/MXRoyale/src/main/royale/mx/core/IChildList.as
index 876d2d4..a54d673 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/IChildList.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/IChildList.as
@@ -24,6 +24,7 @@ COMPILE::SWF
{
import flash.display.DisplayObject;
}
+import org.apache.royale.core.IUIBase;
/**
* The IChildList interface defines the properties and methods
@@ -294,7 +295,7 @@ public interface IChildList
* @productversion Flex 3
*/
[SWFOverride(params="flash.display.DisplayObject", altparams="mx.core.UIComponent"))]
- function contains(child:IUIComponent):Boolean;
+ function contains(child:IUIBase):Boolean;
}
}
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 017d139..d3e963e 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
@@ -3549,7 +3549,7 @@ COMPILE::JS
[SWFOverride(params="flash.display.DisplayObject", altparams="mx.core.UIComponent"))]
COMPILE::SWF
{ override }
- public function contains(child:IUIComponent):Boolean
+ public function contains(child:IUIBase):Boolean
{
COMPILE::SWF
{
@@ -5237,10 +5237,10 @@ COMPILE::JS
*/
public function owns(child:IUIBase):Boolean
{
- if (!(child is IUIComponent))
+ if (!(child is IUIBase))
return false;
- return contains(child as IUIComponent);
+ return contains(child as IUIBase);
}
/**