This is an automated email from the ASF dual-hosted git repository. joshtynjala pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit afecc520560d897d9a1558c6681835d2a20b5d14 Author: Josh Tynjala <[email protected]> AuthorDate: Mon Mar 16 10:18:24 2026 -0700 SparkRoyale: fix invalid MXML that the compiler didn't catch before Only MX Containers and classes with [DefaultProperty] may have children elements in MXML. Some of the spark skins had children that were simply being ignored by the compiler before, but an error may be reported when parity with the Flex SDK compiler is implemented. Mostly just adjusting what was commented out. --- .../spark/skins/spark/ComboBoxButtonSkin.mxml | 32 +++++++++++----------- .../spark/skins/spark/ComboBoxTextInputSkin.mxml | 12 ++++---- .../spark/skins/spark/DropDownListButtonSkin.mxml | 20 +++++++------- .../main/royale/spark/skins/spark/PanelSkin.mxml | 8 +++--- .../skins/spark/TitleWindowCloseButtonSkin.mxml | 20 +++++++------- .../royale/spark/skins/spark/TitleWindowSkin.mxml | 8 +++--- 6 files changed, 50 insertions(+), 50 deletions(-) diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/spark/ComboBoxButtonSkin.mxml b/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/spark/ComboBoxButtonSkin.mxml index aea9a34ae6..84397b6684 100644 --- a/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/spark/ComboBoxButtonSkin.mxml +++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/spark/ComboBoxButtonSkin.mxml @@ -108,7 +108,7 @@ <!-- layer 1: fill --> <!--- @private --> <s:Rect id="fill" left="1" right="1" top="1" bottom="1"> - <!-- <s:fill> --> + <!-- <s:fill> <s:LinearGradient rotation="90"> <s:GradientEntry color="0xFFFFFF" color.over="0xBBBDBD" @@ -119,25 +119,25 @@ color.down="0x929496" alpha="0.85" /> </s:LinearGradient> - <!-- </s:fill> --> + </s:fill> --> </s:Rect> <!-- layer 2: fill lowlight --> <!--- @private --> <s:Rect id="lowlight" left="1" right="1" top="1" bottom="1"> - <!-- <s:fill> --> + <!-- <s:fill> <s:LinearGradient rotation="270"> <s:GradientEntry color="0x000000" ratio="0.0" alpha="0.0627" /> <s:GradientEntry color="0x000000" ratio="0.48" alpha="0.0099" /> <s:GradientEntry color="0x000000" ratio="0.48001" alpha="0" /> </s:LinearGradient> - <!-- </s:fill> --> + </s:fill> --> </s:Rect> <!-- layer 3: fill highlight --> <!--- @private --> <s:Rect id="highlight" left="1" right="1" top="1" bottom="1"> - <!-- <s:fill> --> + <!-- <s:fill> <s:LinearGradient rotation="90"> <s:GradientEntry color="0xFFFFFF" ratio="0.0" @@ -153,24 +153,24 @@ ratio="0.48001" alpha="0" /> </s:LinearGradient> - <!-- </s:fill> --> + </s:fill> --> </s:Rect> <!-- layer 4: highlight stroke (all states except down) --> <!--- @private --> <s:Rect id="highlightStroke" left="1" right="1" top="1" bottom="1" radiusX="0" radiusY="0" excludeFrom="down"> - <!-- <s:stroke> --> + <!-- <s:stroke> <s:LinearGradientStroke rotation="90" weight="1"> <s:GradientEntry color="0xFFFFFF" alpha.over="0.22" /> <s:GradientEntry color="0xD8D8D8" alpha.over="0.22" /> </s:LinearGradientStroke> - <!-- </s:stroke> --> + </s:stroke> --> </s:Rect> <!-- layer 5: highlight stroke (down state only) --> <!--- @private --> <s:Rect id="hldownstroke1" left="1" right="1" top="1" bottom="1" radiusX="0" radiusY="0" includeIn="down"> - <!-- <s:stroke> --> + <!-- <s:stroke> <s:LinearGradientStroke rotation="90" weight="1"> <s:GradientEntry color="0x000000" alpha="0.25" ratio="0.0" /> <s:GradientEntry color="0x000000" alpha="0.25" ratio="0.001" /> @@ -178,22 +178,22 @@ <s:GradientEntry color="0x000000" alpha="0.07" ratio="0.965" /> <s:GradientEntry color="0x000000" alpha="0.00" ratio="0.9651" /> </s:LinearGradientStroke> - <!-- </s:stroke> --> + </s:stroke> --> </s:Rect> <!--- @private --> <s:Rect id="hldownstroke2" left="2" right="2" top="2" bottom="2" radiusX="0" radiusY="0" includeIn="down"> - <!-- <s:stroke> --> + <!-- <s:stroke> <s:LinearGradientStroke rotation="90" weight="1"> <s:GradientEntry color="0x000000" alpha="0.09" ratio="0.0" /> <s:GradientEntry color="0x000000" alpha="0.00" ratio="0.0001" /> </s:LinearGradientStroke> - <!-- </s:stroke> --> + </s:stroke> --> </s:Rect> <!-- layer 6: border - put on top of the fill so it doesn't disappear when scale is less than 1 --> <!--- @private --> <s:Rect id="border" left="0" right="0" top="0" bottom="0" width="18" height="21"> - <!-- <s:stroke> --> + <!-- <s:stroke> <s:LinearGradientStroke rotation="90" weight="1"> <s:GradientEntry color="0x000000" alpha="0.5625" @@ -202,7 +202,7 @@ alpha="0.75" alpha.down="0.85" /> </s:LinearGradientStroke> - <!-- </s:stroke> --> + </s:stroke> --> </s:Rect> <!-- layer 7: arrow --> @@ -216,13 +216,13 @@ The first part of the arrow's gradient fill. The default alpha is .6. The default color if 0x000000. --> - <s:GradientEntry id="arrowFill1" color="0" alpha="0.6" /> + <!-- <s:GradientEntry id="arrowFill1" color="0" alpha="0.6" /> --> <!--- @private The second part of the arrow's gradient fill. The default alpha is .6. The default color if 0x000000. --> - <s:GradientEntry id="arrowFill2" color="0" alpha="0.8" /> + <!-- <s:GradientEntry id="arrowFill2" color="0" alpha="0.8" /> --> <!-- </s:RadialGradient> --> <!-- </s:fill> --> </s:Path> diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/spark/ComboBoxTextInputSkin.mxml b/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/spark/ComboBoxTextInputSkin.mxml index 4a51c1bf4b..4a16125ed2 100644 --- a/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/spark/ComboBoxTextInputSkin.mxml +++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/spark/ComboBoxTextInputSkin.mxml @@ -112,8 +112,8 @@ } } - borderStroke.color = getStyle("borderColor"); - borderStroke.alpha = getStyle("borderAlpha"); + // borderStroke.color = getStyle("borderColor"); + // borderStroke.alpha = getStyle("borderAlpha"); /* var cr:Number = getStyle("cornerRadius"); @@ -218,7 +218,7 @@ <s:Rect left="0" right="0" top="0" bottom="0" id="border"> <!-- <s:stroke> --> <!--- @private --> - <s:SolidColorStroke id="borderStroke" weight="1" /> + <!-- <s:SolidColorStroke id="borderStroke" weight="1" /> --> <!-- </s:stroke> --> </s:Rect> @@ -227,16 +227,16 @@ <s:Rect id="background" left="1" right="1" top="1" bottom="1"> <!-- <s:fill> --> <!--- Defines the background fill color. --> - <s:SolidColor id="bgFill" color="0xFFFFFF" /> + <!-- <s:SolidColor id="bgFill" color="0xFFFFFF" /> --> <!-- </s:fill> --> </s:Rect> <!-- shadow --> <!--- @private --> <s:Rect left="1" top="1" right="1" height="1" id="shadow"> - <!-- <s:fill> --> + <!-- <s:fill> <s:SolidColor color="0x000000" alpha="0.12" /> - <!-- </s:fill> --> + </s:fill> --> </s:Rect> <!-- text --> diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/spark/DropDownListButtonSkin.mxml b/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/spark/DropDownListButtonSkin.mxml index 3338b83a74..2d30b2f95e 100644 --- a/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/spark/DropDownListButtonSkin.mxml +++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/spark/DropDownListButtonSkin.mxml @@ -174,18 +174,18 @@ <!-- layer 5: highlight stroke (all states except down) --> <!--- @private --> <s:Rect id="highlightStroke" left="1" right="1" top="1" bottom="1" excludeFrom="down" radiusX="2"> - <!-- <s:stroke> --> + <!-- <s:stroke> <s:LinearGradientStroke rotation="90" weight="1"> <s:GradientEntry color="0xFFFFFF" alpha.over="0.22" /> <s:GradientEntry color="0xD8D8D8" alpha.over="0.22" /> </s:LinearGradientStroke> - <!-- </s:stroke> --> + </s:stroke> --> </s:Rect> <!-- layer 6: highlight stroke (down state only) --> <!--- @private --> <s:Rect id="hldownstroke1" left="1" right="1" top="1" bottom="1" radiusX="2" includeIn="down"> - <!-- <s:stroke> --> + <!-- <s:stroke> <s:LinearGradientStroke rotation="90" weight="1"> <s:GradientEntry color="0x000000" alpha="0.25" ratio="0.0" /> <s:GradientEntry color="0x000000" alpha="0.25" ratio="0.001" /> @@ -193,22 +193,22 @@ <s:GradientEntry color="0x000000" alpha="0.07" ratio="0.965" /> <s:GradientEntry color="0x000000" alpha="0.00" ratio="0.9651" /> </s:LinearGradientStroke> - <!-- </s:stroke> --> + </s:stroke> --> </s:Rect> <!--- @private --> <s:Rect id="hldownstroke2" left="2" right="2" top="2" bottom="2" radiusX="2" includeIn="down"> - <!-- <s:stroke> --> + <!-- <s:stroke> <s:LinearGradientStroke rotation="90" weight="1"> <s:GradientEntry color="0x000000" alpha="0.09" ratio="0.0" /> <s:GradientEntry color="0x000000" alpha="0.00" ratio="0.0001" /> </s:LinearGradientStroke> - <!-- </s:stroke> --> + </s:stroke> --> </s:Rect> <!-- layer 7: border - put on top of the fill so it doesn't disappear when scale is less than 1 --> <!--- @private --> <s:Rect id="border" left="0" right="0" top="0" bottom="0" width="69" height="20" radiusX="2"> - <!-- <s:stroke> --> + <!-- <s:stroke> <s:LinearGradientStroke rotation="90" weight="1"> <s:GradientEntry color="0x000000" alpha="0.5625" @@ -217,7 +217,7 @@ alpha="0.75" alpha.down="0.85" /> </s:LinearGradientStroke> - <!-- </s:stroke> --> + </s:stroke> --> </s:Rect> <s:Rect right="18" top="1" bottom="1" width="1"> <!-- <s:fill> @@ -241,11 +241,11 @@ <!--- @private The first part of the arrow's gradient fill. The default alpha is .6. The default color if 0x000000. --> - <s:GradientEntry id="arrowFill1" color="0" alpha="0.6" /> + <!-- <s:GradientEntry id="arrowFill1" color="0" alpha="0.6" /> --> <!--- @private The second part of the arrow's gradient fill. The default alpha is .6. The default color if 0x000000. --> - <s:GradientEntry id="arrowFill2" color="0" alpha="0.8" /> + <!-- <s:GradientEntry id="arrowFill2" color="0" alpha="0.8" /> --> <!-- </s:RadialGradient> --> <!-- </s:fill> --> </s:Path> diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/spark/PanelSkin.mxml b/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/spark/PanelSkin.mxml index 0814128f85..12888a77f9 100644 --- a/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/spark/PanelSkin.mxml +++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/spark/PanelSkin.mxml @@ -225,8 +225,8 @@ <s:Rect id="tbHilite" left="0" right="0" top="0" bottom="0"> <s:stroke> <s:LinearGradientStroke rotation="90" weight="1"> - <s:GradientEntry color="0xEAEAEA" /> - <s:GradientEntry color="0xD9D9D9" /> + <!-- <s:GradientEntry color="0xEAEAEA" /> + <s:GradientEntry color="0xD9D9D9" /> --> </s:LinearGradientStroke> </s:stroke> </s:Rect> @@ -273,8 +273,8 @@ <s:Rect left="0" right="0" top="1" bottom="0"> <s:stroke> <s:LinearGradientStroke rotation="90" weight="1"> - <s:GradientEntry color="0xE5E5E5" /> - <s:GradientEntry color="0xD8D8D8" /> + <!-- <s:GradientEntry color="0xE5E5E5" /> + <s:GradientEntry color="0xD8D8D8" /> --> </s:LinearGradientStroke> </s:stroke> </s:Rect> diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/spark/TitleWindowCloseButtonSkin.mxml b/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/spark/TitleWindowCloseButtonSkin.mxml index 06fa72b194..598f54c872 100644 --- a/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/spark/TitleWindowCloseButtonSkin.mxml +++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/spark/TitleWindowCloseButtonSkin.mxml @@ -75,23 +75,23 @@ <!--- Define the border and fill. --> <s:Rect left="0" top="0" right="0" bottom="0"> - <!-- <s:stroke> --> + <!-- <s:stroke> <s:SolidColorStroke color="0x000000" alpha="0.0" alpha.over="0.7" alpha.down="0.7" weight="1"/> - <!-- </s:stroke> --> - <!-- <s:fill> --> + </s:stroke> --> + <!-- <s:fill> <s:SolidColor color="0xCCCCCC" alpha="0" alpha.down="0.7" /> - <!-- </s:fill> --> + </s:fill> --> </s:Rect> <!--- Define the inner shadow. --> <s:Rect id="cbshad" left="1" right="1" top="1" height="1" > - <!-- <s:fill> --> + <!-- <s:fill> <s:SolidColor color="0x000000" color.over="0xFFFFFF" alpha="0" alpha.over=".85" alpha.down="0.22" /> - <!-- </s:fill> --> + </s:fill> --> </s:Rect> <!--- Defines the appearance of the x in the close button. --> @@ -100,7 +100,7 @@ data="M 3 5 L 4 5 L 4 6 L 5 6 L 5 7 L 4 7 L 4 8 L 3 8 L 3 9 L 4 9 L 4 10 L 5 10 L 5 9 L 6 9 L 6 8 L 7 8 L 7 9 L 8 9 L 8 10 L 9 10 L 9 9 L 10 9 L 10 8 L 9 8 L 9 7 L 8 7 L 8 6 L 9 6 L 9 5 L 10 5 L 10 4 L 9 4 L 9 3 L 8 3 L 8 4 L 7 4 L 7 5 L 6 5 L 6 4 L 5 4 L 5 3 L 4 3 L 4 4 L 3 4 L 3 5 Z"> <!-- <s:fill> --> <!--- @private --> - <s:SolidColor id="xFill1" color="0x000000" /> + <!-- <s:SolidColor id="xFill1" color="0x000000" /> --> <!-- </s:fill> --> </s:Path> @@ -108,14 +108,14 @@ data="M 3 3 L 4 3 L 4 4 L 3 4 L 3 3 M 3 9 L 4 9 L 4 10 L 3 10 L 3 9 M 9 3 L 10 3 L 10 4 L 9 4 L 9 3 M 9 9 L 10 9 L 10 10 L 9 10 L 9 9 Z"> <!-- <s:fill> --> <!--- @private --> - <s:SolidColor id="xFill2" color="0x000000" /> + <!-- <s:SolidColor id="xFill2" color="0x000000" /> --> <!-- </s:fill> --> </s:Path> <!-- blendMode="normal" alpha=".85" --><s:Path data="M 3 5 L 3 6 L 4 6 L 4 7 L 5 7 L 5 6 L 4 6 L 4 5 L 3 5 M 8 6 L 8 7 L 9 7 L 9 6 L 10 6 L 10 5 L 9 5 L 9 6 L 8 6 M 3 10 L 3 11 L 5 11 5 10 L 6 10 L 6 9 L 7 9 L 7 10 L 8 10 L 8 11 L 10 11 L 10 10 L 8 10 L 8 9 L 7 9 L 7 8 L 6 8 L 6 9 L 5 9 L 5 10 L 3 10 Z"> - <!-- <s:fill> --> + <!-- <s:fill> <s:SolidColor color="0xFFFFFF" /> - <!-- </s:fill> --> + </s:fill> --> </s:Path> </s:Group> </s:SparkSkin> \ No newline at end of file diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/spark/TitleWindowSkin.mxml b/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/spark/TitleWindowSkin.mxml index e70bce70b1..7176df11ea 100644 --- a/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/spark/TitleWindowSkin.mxml +++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/spark/TitleWindowSkin.mxml @@ -225,8 +225,8 @@ <s:Rect id="tbHilite" left="0" right="0" top="0" bottom="0"> <s:stroke> <s:LinearGradientStroke rotation="90" weight="1"> - <s:GradientEntry color="0xE6E6E6" /> - <s:GradientEntry color="0xFFFFFF" alpha="0.22"/> + <!-- <s:GradientEntry color="0xE6E6E6" /> + <s:GradientEntry color="0xFFFFFF" alpha="0.22"/> --> </s:LinearGradientStroke> </s:stroke> <!-- @@ -290,8 +290,8 @@ <s:Rect left="0" right="0" top="1" bottom="0"> <s:stroke> <s:LinearGradientStroke rotation="90" weight="1"> - <s:GradientEntry color="0xFFFFFF" /> - <s:GradientEntry color="0xD8D8D8" /> + <!-- <s:GradientEntry color="0xFFFFFF" /> + <s:GradientEntry color="0xD8D8D8" /> --> </s:LinearGradientStroke> </s:stroke> </s:Rect>
