[royale-asjs] branch develop updated: Support for responsive size bead by percentage

[hugoferreira]

This is an automated email from the ASF dual-hosted git repository.

hugoferreira 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 06fcb6b  Support for responsive size bead by percentage
06fcb6b is described below

commit 06fcb6b19c9cd70c90ff386c26746a545c38722b
Author: Hugo Ferreira <hferre...@solidsoft.pt>
AuthorDate: Sat Jan 29 23:48:46 2022 +0000

    Support for responsive size bead by percentage
---
 .../royale/jewel/beads/controls/ResponsiveSize.as  | 30 ++++++++++++----------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/ResponsiveSize.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/ResponsiveSize.as
index f524cf9..f45cbc6 100644
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/ResponsiveSize.as
+++ 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/ResponsiveSize.as
@@ -286,11 +286,12 @@ package org.apache.royale.jewel.beads.controls
                             control.height = widescreenHeight;
                         responsiveFlag = true;
                     }
-                    else if(!isNaN(widescreenPercentWidth) || 
!isNaN(widescreenPercentHeight))
-                    {
+                    
+                    if(!isNaN(widescreenPercentWidth))
                         control.percentWidth = widescreenPercentWidth;
+
+                    if(!isNaN(widescreenPercentHeight))
                         control.percentHeight = widescreenPercentHeight;
-                    }
                 } 
                 else if(outerWidth < ResponsiveSizes.WIDESCREEN_BREAKPOINT && 
outerWidth > ResponsiveSizes.DESKTOP_BREAKPOINT)
                 {
@@ -303,11 +304,12 @@ package org.apache.royale.jewel.beads.controls
                             control.height = desktopHeight;
                         responsiveFlag = true;
                     }
-                    else if(!isNaN(desktopPercentWidth) || 
!isNaN(desktopPercentHeight))
-                    {
+                    
+                    if(!isNaN(desktopPercentWidth))
                         control.percentWidth = desktopPercentWidth;
+
+                    if(!isNaN(desktopPercentHeight))
                         control.percentHeight = desktopPercentHeight;
-                    }
                 }
                 else if(outerWidth < ResponsiveSizes.DESKTOP_BREAKPOINT && 
outerWidth > ResponsiveSizes.TABLET_BREAKPOINT)
                 {
@@ -320,11 +322,12 @@ package org.apache.royale.jewel.beads.controls
                             control.height = tabletHeight;
                         responsiveFlag = true;
                     }
-                    else if(!isNaN(tabletPercentWidth) || 
!isNaN(tabletPercentHeight))
-                    {
+
+                    if(!isNaN(tabletPercentWidth))
                         control.percentWidth = tabletPercentWidth;
+
+                    if(!isNaN(tabletPercentHeight))
                         control.percentHeight = tabletPercentHeight;
-                    }
                 }
                 else if(outerWidth < ResponsiveSizes.TABLET_BREAKPOINT && 
outerWidth > ResponsiveSizes.PHONE_BREAKPOINT)
                 {
@@ -337,11 +340,12 @@ package org.apache.royale.jewel.beads.controls
                             control.height = phoneHeight;
                         responsiveFlag = true;
                     }
-                    else if(!isNaN(phonePercentWidth) || 
!isNaN(phonePercentHeight))
-                    {
+
+                    if(!isNaN(phonePercentWidth))
+                        control.percentWidth = phonePercentWidth;
+
+                    if(!isNaN(phonePercentHeight))
                         control.percentWidth = phonePercentWidth;
-                        control.percentHeight = phonePercentHeight;
-                    }
                 }
 
                 if(!responsiveFlag)