You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by gr...@apache.org on 2021/02/09 03:05:58 UTC
[royale-asjs] branch develop updated (c239f63 -> b06ae50)
This is an automated email from the ASF dual-hosted git repository.
gregdove pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.
from c239f63 jewel-togglebuttonbar: implement toggleOnClick and remove allowMultipleSelection until more investigation for the later. Still need to implement -1 when deselect the current button (partial #1074)
new 41e1c0e lock the Graphics instance index as a local private member at construction. This resolves some potential conflicts for complex fill types when multiple constructions occur before 'rendering'.
new f381657 Merge branch 'develop' of https://github.com/apache/royale-asjs into develop
new b06ae50 tidy: remove unnecessary space
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/royale/org/apache/royale/display/Graphics.as | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
[royale-asjs] 02/03: Merge branch 'develop' of
https://github.com/apache/royale-asjs into develop
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gregdove pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit f381657fa23d2339668d19ab64965019986f4a21
Merge: 41e1c0e c239f63
Author: greg-dove <gr...@gmail.com>
AuthorDate: Tue Feb 9 15:58:58 2021 +1300
Merge branch 'develop' of https://github.com/apache/royale-asjs into develop
.../src/main/royale/ButtonBarPlayGround.mxml | 9 ++---
.../projects/Jewel/src/main/resources/defaults.css | 6 ++-
.../royale/org/apache/royale/jewel/ToggleButton.as | 2 +-
.../org/apache/royale/jewel/ToggleButtonBar.as | 46 +++++++++++++++++++---
.../jewel/beads/views/ToggleButtonBarView.as | 17 ++++----
.../itemRenderers/IconButtonBarItemRenderer.as | 1 -
.../itemRenderers/ToggleButtonBarItemRenderer.as | 32 ++++++++++-----
.../Jewel/src/main/sass/components/_buttonbar.sass | 9 ++++-
8 files changed, 90 insertions(+), 32 deletions(-)
[royale-asjs] 01/03: lock the Graphics instance index as a local
private member at construction. This resolves some potential conflicts for
complex fill types when multiple constructions occur before 'rendering'.
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gregdove pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 41e1c0eee1ddfa53e2065136ca61a424de0d7bd9
Author: greg-dove <gr...@gmail.com>
AuthorDate: Tue Feb 9 15:56:26 2021 +1300
lock the Graphics instance index as a local private member at construction.
This resolves some potential conflicts for complex fill types when multiple constructions occur before 'rendering'.
---
.../src/main/royale/org/apache/royale/display/Graphics.as | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/display/Graphics.as b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/display/Graphics.as
index 1b8ca39..22b9576 100644
--- a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/display/Graphics.as
+++ b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/display/Graphics.as
@@ -124,9 +124,12 @@ package org.apache.royale.display
COMPILE::JS
{
//increment the Graphics instance index
- _instIdx ++;
+ _inst_idx = _instIdx ++;
}
}
+
+ COMPILE::JS
+ private var _inst_idx:uint;
private var graphicsTarget:IGraphicsTarget;
@@ -324,7 +327,7 @@ package org.apache.royale.display
patternElement.appendChild(imageUse);
defs.appendChild(patternElement);
- patternElement.setAttribute('id', 'royale-bitmapfill-' + _instIdx + '-' + defsIdx);
+ patternElement.setAttribute('id', 'royale-bitmapfill-' + _inst_idx + '-' + defsIdx);
defsIdx++;
return patternElement;
}
@@ -338,7 +341,7 @@ package org.apache.royale.display
var gradientElement:SVGGradientElement = createGraphicsSVG(elementType, false) as SVGGradientElement;
gradientElement.setAttributeNS(null, 'gradientUnits', 'userSpaceOnUse');
defs.appendChild(gradientElement);
- gradientElement.setAttribute('id', 'royale-gradient-' + _instIdx + '-' + defsIdx);
+ gradientElement.setAttribute('id', 'royale-gradient-' + _inst_idx + '-' + defsIdx);
defsIdx++;
return gradientElement;
}
[royale-asjs] 03/03: tidy: remove unnecessary space
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gregdove pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit b06ae5092deb3e4db2ab17877480d28bf218c76b
Author: greg-dove <gr...@gmail.com>
AuthorDate: Tue Feb 9 16:05:11 2021 +1300
tidy: remove unnecessary space
---
.../Graphics/src/main/royale/org/apache/royale/display/Graphics.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/display/Graphics.as b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/display/Graphics.as
index 22b9576..4aae5dc 100644
--- a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/display/Graphics.as
+++ b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/display/Graphics.as
@@ -124,7 +124,7 @@ package org.apache.royale.display
COMPILE::JS
{
//increment the Graphics instance index
- _inst_idx = _instIdx ++;
+ _inst_idx = _instIdx++;
}
}