This is an automated email from the ASF dual-hosted git repository.
pushminakazi 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 334777c Added getLineMetrics in TextArea.as,selectable and collection
in AdvancedListBase.as,DataGridListBase.as,ListBase.as, owner in
UITextField.as, automationOwner in UIComponent.as
334777c is described below
commit 334777c0380f343d2abfc5cb6de7b433a3305018
Author: pashminakazi <[email protected]>
AuthorDate: Tue Dec 21 05:16:36 2021 -0800
Added getLineMetrics in TextArea.as,selectable and collection in
AdvancedListBase.as,DataGridListBase.as,ListBase.as, owner in UITextField.as,
automationOwner in UIComponent.as
---
.../src/main/royale/mx/controls/TextArea.as | 14 +++++---
.../mx/controls/listClasses/AdvancedListBase.as | 6 ++--
.../mx/controls/listClasses/DataGridListBase.as | 6 ++--
.../royale/mx/controls/listClasses/ListBase.as | 42 ++++++++++++++++++++++
.../src/main/royale/mx/core/UIComponent.as | 17 +++++++++
.../src/main/royale/mx/core/UITextField.as | 12 ++++---
6 files changed, 81 insertions(+), 16 deletions(-)
diff --git
a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/TextArea.as
b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/TextArea.as
index 9c04e5f..427c490 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/TextArea.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/TextArea.as
@@ -54,6 +54,8 @@ import mx.managers.IFocusManagerComponent;
import org.apache.royale.core.ITextModel;
import org.apache.royale.events.Event;
+import org.apache.royale.core.TextLineMetrics;
+import mx.core.IUITextField;
/*
import mx.events.ScrollEvent;
@@ -582,7 +584,7 @@ public class TextArea extends ScrollControlBase
* @playerversion AIR 1.1
* @productversion Flex 3
*/
-// protected var textField:IUITextField;
+ protected var textField:IUITextField;
//----------------------------------
// verticalScrollPosition
@@ -2304,10 +2306,12 @@ public class TextArea extends ScrollControlBase
* @playerversion AIR 1.1
* @productversion Flex 3
*/
-// public function getLineMetrics(lineIndex:int):TextLineMetrics
-// {
-// return textField ? textField.getLineMetrics(lineIndex) : null;
-// }
+ public function getLineMetrics(lineIndex:int):TextLineMetrics
+ {
+ trace("getLineMetrics in mx:TextArea is not implemented");
+ return null;
+ //return textField ? textField.getLineMetrics(lineIndex) : null;
+ }
/**
* Selects the text in the range specified by the parameters.
diff --git
a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/AdvancedListBase.as
b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/AdvancedListBase.as
index 1822acb..a00d332 100644
---
a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/AdvancedListBase.as
+++
b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/AdvancedListBase.as
@@ -640,7 +640,7 @@ public class AdvancedListBase extends ListBase implements
IFocusManagerComponent
* @playerversion AIR 1.1
* @productversion Royale 0.9.4
*/
- protected var collection:ICollectionView;
+ /* protected */ public var collection:ICollectionView;
/**
* The main IViewCursor instance used to fetch items from the
@@ -2527,7 +2527,7 @@ public class AdvancedListBase extends ListBase implements
IFocusManagerComponent
* @playerversion AIR 1.1
* @productversion Royale 0.9.4
*/
- public function get selectable():Boolean
+ override public function get selectable():Boolean
{
return _selectable;
}
@@ -2535,7 +2535,7 @@ public class AdvancedListBase extends ListBase implements
IFocusManagerComponent
/**
* @private
*/
- public function set selectable(value:Boolean):void
+ override public function set selectable(value:Boolean):void
{
_selectable = value;
}
diff --git
a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/DataGridListBase.as
b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/DataGridListBase.as
index 97c89b4..f8db1d6 100644
---
a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/DataGridListBase.as
+++
b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/DataGridListBase.as
@@ -677,7 +677,7 @@ public class DataGridListBase extends ListBase /* extends
UIComponent
* @playerversion AIR 1.1
* @productversion Royale 0.9.4
*/
- protected var collection:ICollectionView;
+ /* protected */ public var collection:ICollectionView;
/**
* The main IViewCursor instance used to fetch items from the
@@ -2573,7 +2573,7 @@ public class DataGridListBase extends ListBase /* extends
UIComponent
* @playerversion AIR 1.1
* @productversion Royale 0.9.4
*/
- public function get selectable():Boolean
+ override public function get selectable():Boolean
{
return _selectable;
}
@@ -2581,7 +2581,7 @@ public class DataGridListBase extends ListBase /* extends
UIComponent
/**
* @private
*/
- public function set selectable(value:Boolean):void
+ override public function set selectable(value:Boolean):void
{
_selectable = value;
}
diff --git
a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as
b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as
index 26ec297..a42324a 100644
---
a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as
+++
b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as
@@ -1934,6 +1934,48 @@ use namespace mx_internal;
{
return NaN;
}
+
+ protected var collection:ICollectionView;
+
+ //----------------------------------
+ // selectable
+ //----------------------------------
+
+ /**
+ * @private
+ * Storage for the selectable property.
+ */
+ private var _selectable:Boolean = true;
+
+ [Inspectable(defaultValue="true")]
+
+ /**
+ * A flag that indicates whether the list shows selected items
+ * as selected.
+ * If <code>true</code>, the control supports selection.
+ * The Menu class, which subclasses ListBase, sets this property to
+ * <code>false</code> by default, because it doesn't show the chosen
+ * menu item as selected.
+ *
+ * @default true
+ *
+ * @langversion 3.0
+ * @playerversion Flash 9
+ * @playerversion AIR 1.1
+ * @productversion Flex 3
+ */
+ public function get selectable():Boolean
+ {
+ return _selectable;
+ }
+
+ /**
+ * @private
+ */
+ public function set selectable(value:Boolean):void
+ {
+ _selectable = value;
+ }
}
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 fa954ef..b5f336d 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
@@ -1732,6 +1732,23 @@ public class UIComponent extends UIBase
{
_owner = value;
}
+
+ //----------------------------------
+ // automationOwner
+ //----------------------------------
+
+ /**
+ * @inheritDoc
+ *
+ * @langversion 3.0
+ * @playerversion Flash 9
+ * @playerversion AIR 1.1
+ * @productversion Flex 4
+ */
+ public function get automationOwner():IUIComponent
+ {
+ return owner;
+ }
//----------------------------------
// doubleClickEnabled
diff --git
a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UITextField.as
b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UITextField.as
index e2fc885..f8eaf59 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UITextField.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UITextField.as
@@ -38,6 +38,7 @@ import flash.text.TextLineMetrics;
import mx.styles.ISimpleStyleClient;
import mx.styles.IStyleManager2;
import mx.utils.StringUtil;
+ import mx.core.IUIComponent;
import org.apache.royale.core.TextLineMetrics;
import org.apache.royale.events.Event;
@@ -2833,7 +2834,7 @@ public class UITextField extends UIComponent implements
IUITextField
/**
* @private
*/
- //private var _owner:DisplayObjectContainer;
+ private var _owner:IUIComponent; /* DisplayObjectContainer; */
/**
* By default, set to the parent container of this object.
@@ -2854,17 +2855,18 @@ public class UITextField extends UIComponent
implements IUITextField
* @playerversion AIR 1.1
* @productversion Royale 0.9.3
*/
- /* public function get owner():DisplayObjectContainer
+ override public function get owner():IUIComponent
{
- return _owner ? _owner : parent;
+ return _owner ? _owner : parent as IUIComponent;
}
- public function set owner(value:DisplayObjectContainer):void
+ override public function set owner(value:IUIComponent):void
{
_owner = value;
}
- private function creatingSystemManager():ISystemManager
+
+ /* private function creatingSystemManager():ISystemManager
{
return ((moduleFactory != null) && (moduleFactory is ISystemManager))
? ISystemManager(moduleFactory)
