You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by yi...@apache.org on 2020/10/22 05:05:12 UTC
[royale-asjs] branch develop updated (9f29229 -> 0fe9243)
This is an automated email from the ASF dual-hosted git repository.
yishayw pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.
from 9f29229 - Made the TDJ example copy the themes into the debug-js and not the release-js directory and added an execution of the resources plugin to copy them over from debug to release
new fc44456 more stubs in mx
new b7714e0 Adding some stubs in emulation and moving some to base classes
new 0fe9243 Merge branch 'develop' of https://github.com/apache/royale-asjs into develop
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/royale/mx/controls/DataGrid.as | 5 ++
.../MXRoyale/src/main/royale/mx/controls/Tree.as | 89 +++++++++++-----------
.../mx/controls/listClasses/AdvancedListBase.as | 50 +++++-------
.../mx/controls/listClasses/DataGridListBase.as | 58 ++++----------
.../royale/mx/controls/listClasses/ListBase.as | 38 +++++++++
.../src/main/royale/mx/display/LoaderInfo.as | 8 +-
.../src/main/royale/spark/components/List.as | 14 ++--
7 files changed, 134 insertions(+), 128 deletions(-)
[royale-asjs] 03/03: Merge branch 'develop' of
https://github.com/apache/royale-asjs into develop
Posted by yi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yishayw pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 0fe92435122edd2c84bbefaebb14ff341a4c519d
Merge: b7714e0 9f29229
Author: Yishay Weiss <yi...@yell.com>
AuthorDate: Thu Oct 22 06:04:51 2020 +0100
Merge branch 'develop' of https://github.com/apache/royale-asjs into develop
examples/jewel/TourDeJewel/pom.xml | 272 ++++++++++++++++++++-----------------
1 file changed, 147 insertions(+), 125 deletions(-)
[royale-asjs] 01/03: more stubs in mx
Posted by yi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yishayw pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit fc44456fac4e7da570f6b7614ab2c0fb972011f8
Author: Yishay Weiss <yi...@yell.com>
AuthorDate: Thu Oct 22 05:06:25 2020 +0100
more stubs in mx
---
.../src/main/royale/mx/controls/DataGrid.as | 5 ++
.../MXRoyale/src/main/royale/mx/controls/Tree.as | 82 +++++++++++-----------
.../mx/controls/listClasses/AdvancedListBase.as | 36 +++++-----
3 files changed, 63 insertions(+), 60 deletions(-)
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/DataGrid.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/DataGrid.as
index 3bfb21b..ef62ec5 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/DataGrid.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/DataGrid.as
@@ -92,6 +92,7 @@ import mx.utils.StringUtil;
use namespace mx_internal;
*/
+import mx.core.UIComponent;
import mx.controls.beads.DataGridSortBead;
import mx.controls.dataGridClasses.DataGridColumn;
import mx.controls.listClasses.ListBase;
@@ -800,6 +801,10 @@ public class DataGrid extends DataGridListBase/*ListBase*/ implements IDataGrid/
*/
public var sortableColumns:Boolean = true;
+ protected function drawRowBackground(s:UIComponent, rowIndex:int, y:Number, height:Number, color:uint, dataIndex:int):void
+ {
+ // not implemented
+ }
/**
* @private
* Storage for the headerHeight property.
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Tree.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Tree.as
index 0809692..a8f2b6e 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Tree.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Tree.as
@@ -67,7 +67,7 @@ import mx.core.mx_internal;
import mx.effects.Tween;
import mx.events.CollectionEvent;
import mx.events.CollectionEventKind;
-//import mx.events.DragEvent;
+import mx.events.DragEvent;
import mx.events.FlexEvent;
import mx.events.ListEvent;
//import mx.events.ListEventReason;
@@ -1311,13 +1311,11 @@ public class Tree extends List
/**
* @private
*/
- /* override public function calculateDropIndex(event:DragEvent = null):int
+ /*override*/ public function calculateDropIndex(event:DragEvent = null):int
{
- if (event)
- updateDropData(event);
-
- return _dropData.rowIndex;
- } */
+ // not implemented
+ return -1;
+ }
/**
* @private
@@ -3274,42 +3272,42 @@ public class Tree extends List
/**
* @private
*/
- /* override protected function dragOverHandler(event:DragEvent):void
+ /*override */protected function dragOverHandler(event:DragEvent):void
{
- if (event.isDefaultPrevented())
- return;
-
- lastDragEvent = event;
-
- try
- {
- if (iteratorValid && event.dragSource.hasFormat("treeItems"))
- {
- if (collectionThrowsIPE)
- checkItemIndices(event);
-
- DragManager.showFeedback(event.ctrlKey ?
- DragManager.COPY :
- DragManager.MOVE);
- showDropFeedback(event);
- return;
- }
- }
- catch(e:ItemPendingError)
- {
- if (!lastTreeSeekPending)
- {
- lastTreeSeekPending = new TreeSeekPending(event, dragOverHandler)
- e.addResponder(new ItemResponder(seekPendingDuringDragResultHandler, seekPendingDuringDragFailureHandler,
- lastTreeSeekPending));
- }
- }
- catch(e1:Error)
- {
- }
- hideDropFeedback(event);
- DragManager.showFeedback(DragManager.NONE);
- } */
+ //if (event.isDefaultPrevented())
+ //return;
+//
+ //lastDragEvent = event;
+//
+ //try
+ //{
+ //if (iteratorValid && event.dragSource.hasFormat("treeItems"))
+ //{
+ //if (collectionThrowsIPE)
+ //checkItemIndices(event);
+//
+ //DragManager.showFeedback(event.ctrlKey ?
+ //DragManager.COPY :
+ //DragManager.MOVE);
+ //showDropFeedback(event);
+ //return;
+ //}
+ //}
+ //catch(e:ItemPendingError)
+ //{
+ //if (!lastTreeSeekPending)
+ //{
+ //lastTreeSeekPending = new TreeSeekPending(event, dragOverHandler)
+ //e.addResponder(new ItemResponder(seekPendingDuringDragResultHandler, seekPendingDuringDragFailureHandler,
+ //lastTreeSeekPending));
+ //}
+ //}
+ //catch(e1:Error)
+ //{
+ //}
+ //hideDropFeedback(event);
+ //DragManager.showFeedback(DragManager.NONE);
+ }
/**
* @private
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 ced0681..ff2ac9c 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
@@ -4523,25 +4523,25 @@ public class AdvancedListBase extends ListBase /* extends UIComponent
/**
* @private
*/
- /* mx_internal function clearHighlight(item:IListItemRenderer):void
+ mx_internal function clearHighlight(item:IListItemRenderer):void
{
- var uid:String = itemToUID(item.data);
-
- drawItem(visibleData[uid], isItemSelected(item.data),
- false, uid == caretUID);
-
- var pt:Point = itemRendererToIndices(item);
- if (pt && lastHighlightItemIndices)
- {
- var listEvent:ListEvent =
- new ListEvent(ListEvent.ITEM_ROLL_OUT);
- listEvent.columnIndex = lastHighlightItemIndices.x;
- listEvent.rowIndex = lastHighlightItemIndices.y;
- listEvent.itemRenderer = lastHighlightItemRendererAtIndices;
- dispatchEvent(listEvent);
- lastHighlightItemIndices = null;
- }
- } */
+ //var uid:String = itemToUID(item.data);
+ //
+ //drawItem(visibleData[uid], isItemSelected(item.data),
+ //false, uid == caretUID);
+//
+ //var pt:Point = itemRendererToIndices(item);
+ //if (pt && lastHighlightItemIndices)
+ //{
+ //var listEvent:ListEvent =
+ //new ListEvent(ListEvent.ITEM_ROLL_OUT);
+ //listEvent.columnIndex = lastHighlightItemIndices.x;
+ //listEvent.rowIndex = lastHighlightItemIndices.y;
+ //listEvent.itemRenderer = lastHighlightItemRendererAtIndices;
+ //dispatchEvent(listEvent);
+ //lastHighlightItemIndices = null;
+ //}
+ }
/**
* Refresh all rows on next update.
[royale-asjs] 02/03: Adding some stubs in emulation and moving some
to base classes
Posted by yi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yishayw pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit b7714e00454f751515f904b59f79ff8cfa573678
Author: Yishay Weiss <yi...@yell.com>
AuthorDate: Thu Oct 22 06:03:37 2020 +0100
Adding some stubs in emulation and moving some to base classes
---
.../MXRoyale/src/main/royale/mx/controls/Tree.as | 7 ++-
.../mx/controls/listClasses/AdvancedListBase.as | 14 ------
.../mx/controls/listClasses/DataGridListBase.as | 58 +++++-----------------
.../royale/mx/controls/listClasses/ListBase.as | 38 ++++++++++++++
.../src/main/royale/mx/display/LoaderInfo.as | 8 ++-
.../src/main/royale/spark/components/List.as | 14 +++---
6 files changed, 71 insertions(+), 68 deletions(-)
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Tree.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Tree.as
index a8f2b6e..f3df2e5 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Tree.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Tree.as
@@ -41,7 +41,7 @@ import mx.collections.XMLListCollection;
//import mx.collections.errors.ItemPendingError;
import mx.controls.listClasses.BaseListData;
//import mx.controls.listClasses.IDropInListItemRenderer;
-//import mx.controls.listClasses.IListItemRenderer;
+import mx.controls.listClasses.IListItemRenderer;
//import mx.controls.listClasses.ListRowInfo;
//import mx.controls.listClasses.ListBaseSelectionDataPending;
import mx.controls.treeClasses.DefaultDataDescriptor;
@@ -851,6 +851,11 @@ public class Tree extends List
super.maxHorizontalScrollPosition;
} */
+ protected function drawItem(item:IListItemRenderer, selected:Boolean = false, highlighted:Boolean = false, caret:Boolean = false, transition:Boolean = false):void
+ {
+ // not implemented
+ }
+
/**
* @private
*/
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 ff2ac9c..ac9c708 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
@@ -4544,20 +4544,6 @@ public class AdvancedListBase extends ListBase /* extends UIComponent
}
/**
- * Refresh all rows on next update.
- *
- * @langversion 3.0
- * @playerversion Flash 9
- * @playerversion AIR 1.1
- * @productversion Royale 0.9.4
- */
- public function invalidateList():void
- {
- // itemsSizeChanged = true;
- // invalidateDisplayList();
- }
-
- /**
* Refreshes all rows now. Calling this method can require substantial
* processing, because can be expensive at it completely redraws all renderers
* in the list and won't return until complete.
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 2874ff2..52416b1 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
@@ -44,6 +44,7 @@ COMPILE::JS{
import DisplayObject = org.apache.royale.core.UIBase;
}
+import mx.controls.listClasses.IListItemRenderer;
import mx.collections.CursorBookmark;
import mx.collections.ICollectionView;
import mx.collections.IViewCursor;
@@ -3830,27 +3831,6 @@ public class DataGridListBase extends ListBase /* extends UIComponent
return UIDUtil.getUID(data);
} */
- /**
- * Returns the item renderer for a given item in the data provider,
- * if there is one. Since item renderers only exist for items
- * that are within the set of viewable rows, this method
- * returns <code>null</code> if the item is not visible.
- * For a data grid, this returns the first column's renderer.
- *
- * @param item The data provider item.
- *
- * @return The item renderer or <code>null</code> if the item is not
- * currently displayed.
- *
- * @langversion 3.0
- * @playerversion Flash 9
- * @playerversion AIR 1.1
- * @productversion Royale 0.9.4
- */
- /* public function itemToItemRenderer(item:Object):IListItemRenderer
- {
- return visibleData[itemToUID(item)];
- } */
/**
* Determines if an item is being displayed by a renderer.
@@ -4387,20 +4367,21 @@ public class DataGridListBase extends ListBase /* extends UIComponent
* @playerversion AIR 1.1
* @productversion Royale 0.9.4
*/
- /* protected function drawSelectionIndicator(
- indicator:Sprite, x:Number, y:Number,
+ // not implemented
+ protected function drawSelectionIndicator(
+ indicator:UIComponent, x:Number, y:Number,
width:Number, height:Number, color:uint,
itemRenderer:IListItemRenderer):void
{
- var g:Graphics = Sprite(indicator).graphics;
- g.clear();
- g.beginFill(color);
- g.drawRect(0, 0, width, height);
- g.endFill();
-
- indicator.x = x;
- indicator.y = y;
- } */
+ //var g:Graphics = Sprite(indicator).graphics;
+ //g.clear();
+ //g.beginFill(color);
+ //g.drawRect(0, 0, width, height);
+ //g.endFill();
+ //
+ //indicator.x = x;
+ //indicator.y = y;
+ }
/**
@@ -4544,19 +4525,6 @@ public class DataGridListBase extends ListBase /* extends UIComponent
}
} */
- /**
- * Refresh all rows on next update.
- *
- * @langversion 3.0
- * @playerversion Flash 9
- * @playerversion AIR 1.1
- * @productversion Royale 0.9.4
- */
- public function invalidateList():void
- {
- // itemsSizeChanged = true;
- // invalidateDisplayList();
- }
/**
* Refreshes all rows now. Calling this method can require substantial
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 232b5b0..fcfd394 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
@@ -799,6 +799,21 @@ use namespace mx_internal;
return _strandChildren;
}
+ /**
+ * Refresh all rows on next update.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 9
+ * @playerversion AIR 1.1
+ * @productversion Royale 0.9.4
+ */
+ public function invalidateList():void
+ {
+ // not implemented
+ // itemsSizeChanged = true;
+ // invalidateDisplayList();
+ }
+
public function scrollToIndex(index:int):Boolean
{
@@ -923,6 +938,29 @@ use namespace mx_internal;
this.dispatchEvent(new ValueEvent("childrenRemoved", c));
}
+ /**
+ * Returns the item renderer for a given item in the data provider,
+ * if there is one. Since item renderers only exist for items
+ * that are within the set of viewable rows, this method
+ * returns <code>null</code> if the item is not visible.
+ * For a data grid, this returns the first column's renderer.
+ *
+ * @param item The data provider item.
+ *
+ * @return The item renderer or <code>null</code> if the item is not
+ * currently displayed.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 9
+ * @playerversion AIR 1.1
+ * @productversion Royale 0.9.4
+ */
+ public function itemToItemRenderer(item:Object):IListItemRenderer
+ {
+ // not implemented
+ //return visibleData[itemToUID(item)];
+ return null;
+ }
/**
* @private
*/
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/display/LoaderInfo.as b/frameworks/projects/MXRoyale/src/main/royale/mx/display/LoaderInfo.as
index 0afeb1f..bdcfb9c 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/display/LoaderInfo.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/display/LoaderInfo.as
@@ -19,6 +19,7 @@
package mx.display
{
import org.apache.royale.events.EventDispatcher;
+ import mx.core.UIComponent;
public class LoaderInfo extends EventDispatcher
{
@@ -30,6 +31,11 @@ package mx.display
_loader = loaderValue;
}
+ public function get content():UIComponent
+ {
+ return _loader.content;
+ }
+
public function get loader():Loader
{
return _loader;
@@ -48,4 +54,4 @@ package mx.display
}
}
-}
\ No newline at end of file
+}
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/List.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/List.as
index 2a04ecd..8744367 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/List.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/List.as
@@ -815,7 +815,7 @@ public class List extends ListBase implements IFocusManagerComponent
* @private
* Storage for the dragMoveEnabled property.
*/
- /* private var _dragMoveEnabled:Boolean = false;
+ private var _dragMoveEnabled:Boolean = false;
[Inspectable(defaultValue="false")] */
@@ -839,18 +839,18 @@ public class List extends ListBase implements IFocusManagerComponent
* @playerversion AIR 1.5
* @productversion Flex 4
*/
- /* public function get dragMoveEnabled():Boolean
+ public function get dragMoveEnabled():Boolean
{
- return _dragMoveEnabled;
- } */
+ return _dragMoveEnabled; // not implemented
+ }
/**
* @private
*/
- /* public function set dragMoveEnabled(value:Boolean):void
+ public function set dragMoveEnabled(value:Boolean):void
{
- _dragMoveEnabled = value;
- } */
+ _dragMoveEnabled = value; // not implemented
+ }
//----------------------------------
// dropEnabled