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 2018/08/15 06:36:32 UTC
[royale-asjs] branch feature/MXRoyale updated: remove special
handling for JS sizing. We are using Flex layout logic just about
everywhere so we shouldn't need this code anymore
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch feature/MXRoyale
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/feature/MXRoyale by this push:
new 28965bd remove special handling for JS sizing. We are using Flex layout logic just about everywhere so we shouldn't need this code anymore
28965bd is described below
commit 28965bd6f047e9e414fc94f4154ae549ce3990bf
Author: Alex Harui <ah...@apache.org>
AuthorDate: Tue Aug 14 23:36:19 2018 -0700
remove special handling for JS sizing. We are using Flex layout logic just about everywhere so we shouldn't need this code anymore
---
.../projects/MXRoyale/src/main/royale/mx/controls/Button.as | 8 --------
.../projects/MXRoyale/src/main/royale/mx/controls/Label.as | 9 ---------
.../MXRoyale/src/main/royale/mx/controls/NumericStepper.as | 9 ---------
.../projects/MXRoyale/src/main/royale/mx/controls/Spacer.as | 8 --------
.../projects/MXRoyale/src/main/royale/mx/controls/TextInput.as | 9 ---------
.../SparkRoyale/src/main/royale/spark/components/RichText.as | 8 +-------
.../main/royale/spark/components/supportClasses/ButtonBase.as | 9 ---------
.../main/royale/spark/components/supportClasses/TextBase.as | 10 ----------
8 files changed, 1 insertion(+), 69 deletions(-)
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Button.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Button.as
index 9b84939..82c330d 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Button.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Button.as
@@ -671,14 +671,6 @@ public class Button extends UIComponent implements IDataRenderer
dispatchEvent(newEvent);
}
- COMPILE::JS
- override public function setActualSize(w:Number, h:Number):void
- {
- // For HTML/JS, we only set the size if there is an explicit
- // size set.
- if (!isNaN(explicitWidth)) setWidth(w);
- if (!isNaN(explicitHeight)) setHeight(h);
- }
}
}
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Label.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Label.as
index 224fa91..a555092 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Label.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Label.as
@@ -737,15 +737,6 @@ public class Label extends UIComponent
return element;
}
- COMPILE::JS
- override public function setActualSize(w:Number, h:Number):void
- {
- // For HTML/JS, we only set the size if there is an explicit
- // size set.
- if (!isNaN(explicitWidth)) setWidth(w);
- if (!isNaN(explicitHeight)) setHeight(h);
- }
-
//--------------------------------------------------------------------------
//
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/NumericStepper.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/NumericStepper.as
index 68a4b3d..1b27747 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/NumericStepper.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/NumericStepper.as
@@ -529,15 +529,6 @@ public class NumericStepper extends UIComponent
//
//--------------------------------------------------------------------------
- COMPILE::JS
- override public function setActualSize(w:Number, h:Number):void
- {
- // For HTML/JS, we only set the size if there is an explicit
- // size set.
- if (!isNaN(explicitWidth)) setWidth(w);
- if (!isNaN(explicitHeight)) setHeight(h);
- }
-
//--------------------------------------------------------------------------
//
// Methods
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Spacer.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Spacer.as
index 72e478c..f67f219 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Spacer.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Spacer.as
@@ -78,14 +78,6 @@ public class Spacer extends UIComponent
super();
}
- COMPILE::JS
- override public function setActualSize(w:Number, h:Number):void
- {
- // For HTML/JS, we only set the size if there is an explicit
- // size set.
- if (!isNaN(explicitWidth)) setWidth(w);
- if (!isNaN(explicitHeight)) setHeight(h);
- }
}
}
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/TextInput.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/TextInput.as
index bb40c84..1658116 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/TextInput.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/TextInput.as
@@ -1814,15 +1814,6 @@ public class TextInput extends UIComponent implements ITextInput
//
//--------------------------------------------------------------------------
- COMPILE::JS
- override public function setActualSize(w:Number, h:Number):void
- {
- // For HTML/JS, we only set the size if there is an explicit
- // size set.
- if (!isNaN(explicitWidth)) setWidth(w);
- if (!isNaN(explicitHeight)) setHeight(h);
- }
-
//--------------------------------------------------------------------------
//
// Event handlers
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/RichText.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/RichText.as
index 4a77c87..c3a982c 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/RichText.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/RichText.as
@@ -361,13 +361,7 @@ public class RichText extends TextBase implements IStyleClient
{
updateDisplayList(width, height);
}
-
- COMPILE::JS
- override public function setActualSize(w:Number, h:Number):void
- {
- setWidthAndHeight(w, h);
- }
-
+
COMPILE::JS
override protected function createElement():WrappedHTMLElement
{
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/ButtonBase.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/ButtonBase.as
index be06834..9aee046 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/ButtonBase.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/ButtonBase.as
@@ -450,15 +450,6 @@ public class ButtonBase extends SkinnableComponent implements IFocusManagerCompo
return element;
}
- COMPILE::JS
- override public function setActualSize(w:Number, h:Number):void
- {
- // For HTML/JS, we only set the size if there is an explicit
- // size set.
- if (!isNaN(explicitWidth)) setWidth(w);
- if (!isNaN(explicitHeight)) setHeight(h);
- }
-
public function set fontStyle(value:String):void
{
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/TextBase.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/TextBase.as
index 685cf0b..54791e3 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/TextBase.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/TextBase.as
@@ -597,16 +597,6 @@ public class TextBase extends UIComponent
return element;
}
- COMPILE::JS
- override public function setActualSize(w:Number, h:Number):void
- {
- // For HTML/JS, we only set the size if there is an explicit
- // size set.
- if (!isNaN(explicitWidth)) setWidth(w);
- if (!isNaN(explicitHeight)) setHeight(h);
- }
-
-
//--------------------------------------------------------------------------
/**
* @private