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 2019/12/04 20:48:32 UTC
[royale-asjs] branch develop updated (e050085 -> 800fd57)
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.
from e050085 another scenario for #566
new 3aa45c1 closebutton in title window. still needs CSS
new 800fd57 tune ADG virtual scrolling. Should fix #609
The 2 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:
.../beads/DataGridLinesBeadForICollectionView.as | 2 +-
.../beads/layouts/AdvancedDataGridLayout.as | 8 +++++---
.../AdvancedDataGridVirtualListVerticalLayout.as | 7 ++++---
.../SparkRoyale/src/main/resources/defaults.css | 5 +++++
.../src/main/royale/SparkRoyaleClasses.as | 1 +
...kinnableContainerView.as => TitleWindowView.as} | 23 +++++++---------------
6 files changed, 23 insertions(+), 23 deletions(-)
copy frameworks/projects/SparkRoyale/src/main/royale/spark/components/beads/{SkinnableContainerView.as => TitleWindowView.as} (76%)
[royale-asjs] 02/02: tune ADG virtual scrolling. Should fix #609
Posted by ah...@apache.org.
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
commit 800fd575ad5f930a19d1e7954ce2c807e4c97bc5
Author: Alex Harui <ah...@apache.org>
AuthorDate: Wed Dec 4 12:48:12 2019 -0800
tune ADG virtual scrolling. Should fix #609
---
.../mx/controls/beads/DataGridLinesBeadForICollectionView.as | 2 +-
.../royale/mx/controls/beads/layouts/AdvancedDataGridLayout.as | 8 +++++---
.../beads/layouts/AdvancedDataGridVirtualListVerticalLayout.as | 7 ++++---
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridLinesBeadForICollectionView.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridLinesBeadForICollectionView.as
index 290a4f5..818e1fd 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridLinesBeadForICollectionView.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridLinesBeadForICollectionView.as
@@ -73,7 +73,7 @@ package mx.controls.beads
var contentView:IParentIUIBase = layoutParent.contentView as IParentIUIBase;
var columns:Array = sharedModel.columns;
- var rowHeight:Number = presentationModel.rowHeight;
+ var rowHeight:Number = presentationModel.rowHeight + presentationModel.separatorThickness;
var n:int = getDataProviderLength();
var totalHeight:Number = n * rowHeight;
if (totalHeight < contentView.height)
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/layouts/AdvancedDataGridLayout.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/layouts/AdvancedDataGridLayout.as
index 1e031e5..1adf495 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/layouts/AdvancedDataGridLayout.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/layouts/AdvancedDataGridLayout.as
@@ -100,15 +100,17 @@ package mx.controls.beads.layouts
if (!displayedColumns) return retval;
var n:int = displayedColumns.length;
var listArea:IUIBase = (uiHost.view as IDataGridView).listArea;
+ var actualRowHeight:Number = presentationModel.rowHeight
+ + presentationModel.separatorThickness;
COMPILE::JS
{
- var topSpacerHeight:Number = Math.floor(listArea.element.scrollTop / presentationModel.rowHeight)
- * presentationModel.rowHeight;
+ var topSpacerHeight:Number = Math.floor(listArea.element.scrollTop / actualRowHeight)
+ * actualRowHeight;
}
var model:IDataGridModel = uiHost.model as IDataGridModel;
if (model.dataProvider && model.dataProvider.length)
{
- var totalHeight:Number = model.dataProvider.length * presentationModel.rowHeight;
+ var totalHeight:Number = model.dataProvider.length * actualRowHeight;
COMPILE::JS
{
if (!spacer)
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/layouts/AdvancedDataGridVirtualListVerticalLayout.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/layouts/AdvancedDataGridVirtualListVerticalLayout.as
index 33d72d6..f6ca342 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/layouts/AdvancedDataGridVirtualListVerticalLayout.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/layouts/AdvancedDataGridVirtualListVerticalLayout.as
@@ -247,7 +247,8 @@ package mx.controls.beads.layouts
return true;
}
var presentationModel:IListPresentationModel = (host as IStrandWithPresentationModel).presentationModel as IListPresentationModel;
- var totalHeight:Number = presentationModel.rowHeight * dp.length;
+ var actualRowHeight:Number = presentationModel.rowHeight + presentationModel.separatorThickness;
+ var totalHeight:Number = actualRowHeight * dp.length;
var viewportTop:Number = getVerticalScrollPosition();
// correct overscroll on Safari?
var top:String = host.element.style.top;
@@ -263,9 +264,9 @@ package mx.controls.beads.layouts
}
// end correct overscroll on Safari
var viewportHeight:Number = contentView.element.clientHeight;
- var startIndex:int = Math.floor(viewportTop / presentationModel.rowHeight);
+ var startIndex:int = Math.floor(viewportTop / actualRowHeight);
var factory:IDataProviderVirtualItemRendererMapper = host.getBeadByType(IDataProviderVirtualItemRendererMapper) as IDataProviderVirtualItemRendererMapper;
- var endIndex:int = Math.ceil((viewportTop + viewportHeight) / presentationModel.rowHeight);
+ var endIndex:int = Math.ceil((viewportTop + viewportHeight) / actualRowHeight);
var freeIndex:int;
var firstIndex:int;
var lastIndex:int;
[royale-asjs] 01/02: closebutton in title window. still needs CSS
Posted by ah...@apache.org.
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
commit 3aa45c12e7237a1b41fb052fbba3183000332c92
Author: Alex Harui <ah...@apache.org>
AuthorDate: Tue Dec 3 23:49:45 2019 -0800
closebutton in title window. still needs CSS
---
.../SparkRoyale/src/main/resources/defaults.css | 5 ++
.../src/main/royale/SparkRoyaleClasses.as | 1 +
.../spark/components/beads/TitleWindowView.as | 66 ++++++++++++++++++++++
3 files changed, 72 insertions(+)
diff --git a/frameworks/projects/SparkRoyale/src/main/resources/defaults.css b/frameworks/projects/SparkRoyale/src/main/resources/defaults.css
index 837bfa5..98e2622 100644
--- a/frameworks/projects/SparkRoyale/src/main/resources/defaults.css
+++ b/frameworks/projects/SparkRoyale/src/main/resources/defaults.css
@@ -197,6 +197,11 @@ TextArea
background-color: #FFFFFF;
}
+TitleWindow
+{
+ IBeadView: ClassReference("spark.components.beads.TitleWindowView");
+}
+
/* -------------------------------------------------------
* SWF specific styles
* -------------------------------------------------------
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/SparkRoyaleClasses.as b/frameworks/projects/SparkRoyale/src/main/royale/SparkRoyaleClasses.as
index 641e7fd..82ec840 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/SparkRoyaleClasses.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/SparkRoyaleClasses.as
@@ -78,6 +78,7 @@ internal class SparkRoyaleClasses
import spark.components.beads.GroupView; GroupView;
import spark.components.beads.SkinnableContainerView; SkinnableContainerView;
import spark.components.beads.DropDownListView; DropDownListView;
+ import spark.components.beads.TitleWindowView; TitleWindowView;
import spark.components.beads.controllers.DropDownListController; DropDownListController;
import spark.components.beads.controllers.TabBarController; TabBarController;
import spark.controls.advancedDataGridClasses.MXAdvancedDataGridItemRenderer; MXAdvancedDataGridItemRenderer;
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/beads/TitleWindowView.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/beads/TitleWindowView.as
new file mode 100644
index 0000000..5b5b2a9
--- /dev/null
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/beads/TitleWindowView.as
@@ -0,0 +1,66 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+package spark.components.beads
+{
+
+import spark.components.SkinnableContainer;
+import mx.containers.beads.models.PanelModel;
+
+import org.apache.royale.core.IBead;
+import org.apache.royale.core.ILayoutChild;
+import org.apache.royale.core.IStrand;
+
+/**
+ * @private
+ * The PanelView for emulation.
+ */
+public class TitleWindowView extends PanelView
+{
+ //--------------------------------------------------------------------------
+ //
+ // Constructor
+ //
+ //--------------------------------------------------------------------------
+
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 9
+ * @playerversion AIR 1.1
+ * @productversion Flex 3
+ */
+ public function TitleWindowView()
+ {
+ super();
+ }
+
+ /**
+ */
+ override public function set strand(value:IStrand):void
+ {
+ super.strand = value;
+ var host:SkinnableContainer = _strand as SkinnableContainer;
+ var model:PanelModel = host.model as PanelModel;
+ model.showCloseButton = true;
+ }
+}
+}
+