You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2019/12/12 23:47:32 UTC
[royale-asjs] 31/42: jewel-datagrid: cleaning code
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
commit 2e967c2525f8c933553c2c98a92d486a16729f40
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Fri Dec 6 18:59:05 2019 +0100
jewel-datagrid: cleaning code
---
.../royale/itemRenderers/ProductItemRenderer.as | 62 ----------------------
.../royale/jewel/beads/layouts/DataGridLayout.as | 33 ------------
2 files changed, 95 deletions(-)
diff --git a/examples/royale/TourDeJewel/src/main/royale/itemRenderers/ProductItemRenderer.as b/examples/royale/TourDeJewel/src/main/royale/itemRenderers/ProductItemRenderer.as
deleted file mode 100644
index 60deb8a..0000000
--- a/examples/royale/TourDeJewel/src/main/royale/itemRenderers/ProductItemRenderer.as
+++ /dev/null
@@ -1,62 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// 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 itemRenderers
-{
- import org.apache.royale.html.supportClasses.DataItemRenderer;
- import org.apache.royale.jewel.Image;
-
- public class ProductItemRenderer extends DataItemRenderer
- {
- public function ProductItemRenderer()
- {
- super();
- }
-
- private var image:Image = new Image();
-
- override public function addedToParent():void
- {
- super.addedToParent();
- addElement(image);
- }
-
- override public function get data():Object
- {
- return super.data;
- }
- override public function set data(value:Object):void
- {
- super.data = value;
-
- image.src = value.image;
- }
-
- override public function adjustSize():void
- {
- var cy:Number = this.height/2;
-
- image.x = 4;
- image.y = cy - 16;
- image.width = 32;
- image.height = 32;
-
- updateRenderer();
- }
- }
-}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/DataGridLayout.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/DataGridLayout.as
index a91c6f9..8dff87f 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/DataGridLayout.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/DataGridLayout.as
@@ -120,9 +120,7 @@ package org.apache.royale.jewel.beads.layouts
var borderMetrics:EdgeData = (ValuesManager.valuesImpl as IBorderPaddingMarginValuesImpl).getBorderMetrics(_strand as IUIBase);
var useWidth:Number = uiHost.width - (borderMetrics.left + borderMetrics.right);
- var useHeight:Number = uiHost.height - (borderMetrics.top + borderMetrics.bottom);
- // var xpos:Number = 0;
var defaultColumnWidth:Number = (useWidth) / bbmodel.dataProvider.length;
var columnWidths:Array = [];
@@ -130,10 +128,6 @@ package org.apache.royale.jewel.beads.layouts
var columnDef:IDataGridColumn = (bbmodel.dataProvider as ArrayList).getItemAt(i) as IDataGridColumn;
var columnList:UIBase = displayedColumns[i] as UIBase;
- // probably do not need to set (x,y), but if the Container's layout requires it, they will be set.
- // columnList.x = xpos;
- // columnList.y = 0;
-
var columnWidth:Number = defaultColumnWidth;
if (!isNaN(columnDef.columnWidth)) {
columnWidth = columnDef.columnWidth;
@@ -141,37 +135,10 @@ package org.apache.royale.jewel.beads.layouts
columnList.width = columnWidth;
columnWidths.push(columnWidth);
-
- // xpos += columnList.width;
}
bbmodel.buttonWidths = columnWidths;
- // COMPILE::SWF {
- // header.y = borderMetrics.top;
- // header.x = borderMetrics.left;
- // header.width = useWidth;
- // }
- // COMPILE::JS {
- // (header as UIBase).percentWidth = 100;
- // listArea.element.style.position = "absolute";
- // if (!(uiHost.element.style.position == 'absolute' ||
- // uiHost.element.style.position == 'relative' ||
- // uiHost.element.style.position == 'fixed'))
- // uiHost.element.style.position = 'relative';
- // }
- // header's height is set in CSS
-
- // listArea.y = header.height + header.y;
- // COMPILE::SWF {
- // listArea.x = borderMetrics.left;
- // listArea.width = useWidth;
- // }
- // COMPILE::JS {
- // (listArea as UIBase).percentWidth = 100;
- // }
- // listArea.height = useHeight - header.height;
-
header.dispatchEvent(new Event("layoutNeeded"));
listArea.dispatchEvent(new Event("layoutNeeded"));