This is an automated email from the ASF dual-hosted git repository.
raudjcholo 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 7fea083 Fix bug in GridCells screen resolutions
7fea083 is described below
commit 7fea08335640037fb720bd9f166cdcd11d9e7455
Author: Raul Nuñez <[email protected]>
AuthorDate: Thu Dec 24 12:15:23 2020 +0100
Fix bug in GridCells screen resolutions
---
.../royale/org/apache/royale/jewel/GridCell.as | 27 +++++++++++++++++++---
.../royale/jewel/beads/layouts/GridCellLayout.as | 23 +++++++++++++++++-
2 files changed, 46 insertions(+), 4 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/GridCell.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/GridCell.as
index 396f3f6..fbd8565 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/GridCell.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/GridCell.as
@@ -79,7 +79,7 @@ package org.apache.royale.jewel
{
COMPILE::JS
{
- setFractionForScreen(GridCellLayout.DESKTOP,
value, layout.wideScreenDenominator);
+ setFractionForScreen(GridCellLayout.WIDESCREEN,
value, layout.wideScreenDenominator);
if (parent)
setClassName(computeFinalClassNames());
@@ -107,7 +107,7 @@ package org.apache.royale.jewel
{
COMPILE::JS
{
- setFractionForScreen(GridCellLayout.DESKTOP,
layout.wideScreenNumerator, value);
+ setFractionForScreen(GridCellLayout.WIDESCREEN,
layout.wideScreenNumerator, value);
if (parent)
setClassName(computeFinalClassNames());
@@ -293,8 +293,29 @@ package org.apache.royale.jewel
throw new Error(screen + " numerator
must be between 1 and " + GridCellLayout.MAX_COLUMNS);
if (den <= 0 || den >
GridCellLayout.MAX_COLUMNS)
throw new Error(screen + " denominator
must be between 1 and " + GridCellLayout.MAX_COLUMNS);
+
+ var layNum:Number;
+ var layDen:Number;
+ switch(screen){
+ case GridCellLayout.WIDESCREEN:
+ layNum =
layout.wideScreenNumerator;
+ layDen = layout.wideScreenDenominator;
+ break;
+ case GridCellLayout.DESKTOP:
+ layNum = layout.desktopNumerator;
+ layDen = layout.desktopDenominator;
+ break;
+ case GridCellLayout.TABLET:
+ layNum = layout.tabletNumerator;
+ layDen = layout.tabletDenominator;
+ break;
+ default:
+ layNum = layout.phoneNumerator;
+ layDen = layout.phoneDenominator;
+ break;
+ }
- typeNames = StringUtil.removeWord(typeNames, "
" + screen + "-col-" + layout.desktopNumerator + "-" +
layout.desktopDenominator);
+ typeNames = StringUtil.removeWord(typeNames, "
" + screen + "-col-" + layNum + "-" + layDen);
typeNames += " " + screen + "-col-" + num + "-"
+ den;
}
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/GridCellLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/GridCellLayout.as
index ef2b7f7..47b2f4b 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/GridCellLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/GridCellLayout.as
@@ -296,8 +296,29 @@ package org.apache.royale.jewel.beads.layouts
throw new Error(screen + " numerator
must be between 1 and " + MAX_COLUMNS);
if (den <= 0 || den > MAX_COLUMNS)
throw new Error(screen + " denominator
must be between 1 and " + MAX_COLUMNS);
+
+ var layNum:Number;
+ var layDen:Number;
+ switch(screen){
+ case WIDESCREEN:
+ layNum = _wideScreenNumerator;
+ layDen = _wideScreenDenominator;
+ break;
+ case DESKTOP:
+ layNum = _desktopNumerator;
+ layDen = _desktopDenominator;
+ break;
+ case TABLET:
+ layNum = _tabletNumerator;
+ layDen = _tabletDenominator;
+ break;
+ default:
+ layNum = _phoneNumerator;
+ layDen = _phoneDenominator;
+ break;
+ }
- hostComponent.replaceClass(screen + "-col-" +
_desktopNumerator + "-" + _desktopDenominator, screen + "-col-" + num + "-" +
den);
+ hostComponent.replaceClass(screen + "-col-" +
layNum + "-" + layDen, screen + "-col-" + num + "-" + den);
}
}
