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 2020/03/19 15:37:52 UTC

[royale-asjs] branch develop updated: jewel-gaps: fix gaps limits

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 818aa53  jewel-gaps: fix gaps limits
818aa53 is described below

commit 818aa5355eddf92bb890919fb64bce92637bae58
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Thu Mar 19 16:37:47 2020 +0100

    jewel-gaps: fix gaps limits
---
 .../org/apache/royale/jewel/beads/layouts/HorizontalCenteredLayout.as | 4 ++--
 .../org/apache/royale/jewel/beads/layouts/HorizontalFlowLayout.as     | 4 ++--
 .../royale/org/apache/royale/jewel/beads/layouts/HorizontalLayout.as  | 4 ++--
 .../org/apache/royale/jewel/beads/layouts/VerticalCenteredLayout.as   | 4 ++--
 .../org/apache/royale/jewel/beads/layouts/VerticalFlowLayout.as       | 4 ++--
 .../royale/org/apache/royale/jewel/beads/layouts/VerticalLayout.as    | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalCenteredLayout.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalCenteredLayout.as
index a107b02..7fe48dc 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalCenteredLayout.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalCenteredLayout.as
@@ -206,14 +206,14 @@ package org.apache.royale.jewel.beads.layouts
 		COMPILE::JS
 		private function setGap(value:Number):void
 		{
-			if (value >= 0 && value <= GAPS*GAP_STEP)
+			if (value >= 0 && value <= GAPS)
 			{
 				if (hostClassList.contains("gap-" + _gap + "x" + GAP_STEP + "px"))
 					hostClassList.remove("gap-" + _gap + "x" + GAP_STEP + "px");
 				if(value != 0)
 					hostClassList.add("gap-" + value + "x" + GAP_STEP + "px");
 			} else
-				throw new Error("Gap needs to be between 0 and " + GAPS*GAP_STEP);
+				throw new Error("Gap needs to be between 0 and " + GAPS);
 		}
 		
         /**
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalFlowLayout.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalFlowLayout.as
index e2dee9b..186a8b4 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalFlowLayout.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalFlowLayout.as
@@ -206,14 +206,14 @@ package org.apache.royale.jewel.beads.layouts
 		COMPILE::JS
 		private function setGap(value:Number):void
 		{
-			if (value >= 0 && value <= GAPS*GAP_STEP)
+			if (value >= 0 && value <= GAPS)
 			{
 				if (hostClassList.contains("gap-" + _gap + "x" + GAP_STEP + "px"))
 					hostClassList.remove("gap-" + _gap + "x" + GAP_STEP + "px");
 				if(value != 0)
 					hostClassList.add("gap-" + value + "x" + GAP_STEP + "px");
 			} else
-				throw new Error("Gap needs to be between 0 and " + GAPS*GAP_STEP);
+				throw new Error("Gap needs to be between 0 and " + GAPS);
 		}
 		
         /**
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalLayout.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalLayout.as
index 960f477..01f6fc9 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalLayout.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalLayout.as
@@ -204,14 +204,14 @@ package org.apache.royale.jewel.beads.layouts
 		COMPILE::JS
 		private function setGap(value:Number):void
 		{
-			if (value >= 0 && value <= GAPS*GAP_STEP)
+			if (value >= 0 && value <= GAPS)
 			{
 				if (hostClassList.contains("gap-" + _gap + "x" + GAP_STEP + "px"))
 					hostClassList.remove("gap-" + _gap + "x" + GAP_STEP + "px");
 				if(value != 0)
 					hostClassList.add("gap-" + value + "x" + GAP_STEP + "px");
 			} else
-				throw new Error("Gap needs to be between 0 and " + GAPS*GAP_STEP);
+				throw new Error("Gap needs to be between 0 and " + GAPS);
 		}
 
 		private var variableRowHeightInitialized:Boolean;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalCenteredLayout.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalCenteredLayout.as
index 57ab84e..363274f 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalCenteredLayout.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalCenteredLayout.as
@@ -206,14 +206,14 @@ package org.apache.royale.jewel.beads.layouts
 		COMPILE::JS
 		private function setGap(value:Number):void
 		{
-			if (value >= 0 && value <= GAPS*GAP_STEP)
+			if (value >= 0 && value <= GAPS)
 			{
 				if (hostClassList.contains("gap-" + _gap + "x" + GAP_STEP + "px"))
 					hostClassList.remove("gap-" + _gap + "x" + GAP_STEP + "px");
 				if(value != 0)
 					hostClassList.add("gap-" + value + "x" + GAP_STEP + "px");
 			} else
-				throw new Error("Gap needs to be between 0 and " + GAPS*GAP_STEP);
+				throw new Error("Gap needs to be between 0 and " + GAPS);
 		}
 		
         /**
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalFlowLayout.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalFlowLayout.as
index 0e66e93..c99b828 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalFlowLayout.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalFlowLayout.as
@@ -207,14 +207,14 @@ package org.apache.royale.jewel.beads.layouts
 		COMPILE::JS
 		private function setGap(value:Number):void
 		{
-			if (value >= 0 && value <= GAPS*GAP_STEP)
+			if (value >= 0 && value <= GAPS)
 			{
 				if (hostClassList.contains("gap-" + _gap + "x" + GAP_STEP + "px"))
 					hostClassList.remove("gap-" + _gap + "x" + GAP_STEP + "px");
 				if(value != 0)
 					hostClassList.add("gap-" + value + "x" + GAP_STEP + "px");
 			} else
-				throw new Error("Gap needs to be between 0 and " + GAPS*GAP_STEP);
+				throw new Error("Gap needs to be between 0 and " + GAPS);
 		}
 		
         /**
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalLayout.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalLayout.as
index ebc30d3..b06566b 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalLayout.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalLayout.as
@@ -204,14 +204,14 @@ package org.apache.royale.jewel.beads.layouts
 		COMPILE::JS
 		private function setGap(value:Number):void
 		{
-			if (value >= 0 && value <= GAPS*GAP_STEP)
+			if (value >= 0 && value <= GAPS)
 			{
 				if (hostClassList.contains("gap-" + _gap + "x" + GAP_STEP + "px"))
 					hostClassList.remove("gap-" + _gap + "x" + GAP_STEP + "px");
 				if(value != 0)
 					hostClassList.add("gap-" + value + "x" + GAP_STEP + "px");
 			} else
-				throw new Error("Gap needs to be between 0 and " + GAPS*GAP_STEP);
+				throw new Error("Gap needs to be between 0 and " + GAPS);
 		}
 
 		private var variableRowHeightInitialized:Boolean;