This is an automated email from the ASF dual-hosted git repository.
carlosrovira 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 04f7abf jewel.virtual: some fixes
04f7abf is described below
commit 04f7abfd8e0accaa0f74e5b4a7477130727ef471
Author: Carlos Rovira <[email protected]>
AuthorDate: Fri Feb 7 15:39:45 2020 +0100
jewel.virtual: some fixes
---
.../beads/layouts/VirtualListVerticalLayout.as | 27 ++++++++--------------
.../royale/jewel/beads/views/ComboBoxPopUpView.as | 19 +++++----------
.../jewel/beads/views/VirtualComboBoxPopUpView.as | 21 ++++-------------
3 files changed, 21 insertions(+), 46 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VirtualListVerticalLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VirtualListVerticalLayout.as
index 54b8df8..8682324 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VirtualListVerticalLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VirtualListVerticalLayout.as
@@ -18,21 +18,16 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel.beads.layouts
{
- COMPILE::JS
- {
-
- }
COMPILE::SWF {
+ import org.apache.royale.core.IBorderPaddingMarginValuesImpl;
+ import org.apache.royale.core.ILayoutChild;
+ import org.apache.royale.core.IScrollingViewport;
+ import org.apache.royale.core.ISelectionModel;
+ import org.apache.royale.core.IUIBase;
+ import org.apache.royale.core.ValuesManager;
+ import org.apache.royale.core.layout.EdgeData;
import org.apache.royale.geom.Size;
- import org.apache.royale.core.ISelectionModel;
- import org.apache.royale.core.layout.EdgeData;
- import org.apache.royale.core.IScrollingViewport;
- import org.apache.royale.core.IBorderPaddingMarginValuesImpl;
- import org.apache.royale.core.ValuesManager;
- import org.apache.royale.core.IScrollingViewport;
- import org.apache.royale.html.beads.VirtualDataContainerView;
- import org.apache.royale.core.ILayoutChild;
- import org.apache.royale.core.IUIBase;
+ import org.apache.royale.html.beads.VirtualDataContainerView;
}
import org.apache.royale.collections.ICollectionView;
import org.apache.royale.core.IBeadLayout;
@@ -132,16 +127,14 @@ package org.apache.royale.jewel.beads.layouts
* @royaleignorecoercion Array
* @royaleignorecoercion org.apache.royale.core.ILayoutHost
* @royaleignorecoercion
org.apache.royale.core.WrappedHTMLElement
- * @royaleignorecoercion
org.apache.royale.core.IListPresentationModel
+ * @royaleignorecoercion
org.apache.royale.jewel.supportClasses.list.IListPresentationModel
* @royaleignorecoercion
org.apache.royale.core.IStrandWithPresentationModel
*/
override public function layout():Boolean
{
if (inLayout) return true;
inLayout = true;
-
- // dataProviderModel = host.getBeadByType(IDataProviderModel) as
IDataProviderModel;
-
+
COMPILE::SWF
{
// the strategy for virtualization in SWF is based on the
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ComboBoxPopUpView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ComboBoxPopUpView.as
index c870dea..d19a473 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ComboBoxPopUpView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ComboBoxPopUpView.as
@@ -56,6 +56,8 @@ package org.apache.royale.jewel.beads.views
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
+ *
+ * @royaleignorecoercion org.apache.royale.jewel.List
*/
override public function set strand(value:IStrand):void
{
@@ -63,21 +65,12 @@ package org.apache.royale.jewel.beads.views
var model:IBeadModel = _strand.getBeadByType(IBeadModel) as
IBeadModel;
- _list = new List();
- _list.model = model;
+ list = new List();
+ list.model = model;
- IParent(_strand).addElement(_list);
+ IParent(_strand).addElement(list);
}
- private var _list:List;
-
- public function get list():List
- {
- return _list;
- }
- public function set list(value:List):void
- {
- _list = value;
- }
+ public var list:List;
}
}
\ No newline at end of file
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/VirtualComboBoxPopUpView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/VirtualComboBoxPopUpView.as
index fc3a70f..b4d0449 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/VirtualComboBoxPopUpView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/VirtualComboBoxPopUpView.as
@@ -18,10 +18,10 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel.beads.views
{
- import org.apache.royale.core.BeadViewBase;
import org.apache.royale.core.IBeadModel;
import org.apache.royale.core.IParent;
import org.apache.royale.core.IStrand;
+ import org.apache.royale.jewel.List;
import org.apache.royale.jewel.VirtualList;
/**
@@ -32,7 +32,7 @@ package org.apache.royale.jewel.beads.views
*
* @viewbead
*/
- public class VirtualComboBoxPopUpView extends BeadViewBase
+ public class VirtualComboBoxPopUpView extends ComboBoxPopUpView
{
/**
* constructor
@@ -63,21 +63,10 @@ package org.apache.royale.jewel.beads.views
var model:IBeadModel = _strand.getBeadByType(IBeadModel) as
IBeadModel;
- _list = new VirtualList();
- _list.model = model;
+ list = new VirtualList();
+ list.model = model;
- IParent(_strand).addElement(_list);
+ IParent(_strand).addElement(list);
}
-
- private var _list:VirtualList;
-
- public function get list():VirtualList
- {
- return _list;
- }
- public function set list(value:VirtualList):void
- {
- _list = value;
- }
}
}
\ No newline at end of file
