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/31 14:21:14 UTC
[royale-asjs] branch develop updated: jewel: promote the use of new
icons and remove the need of "material" property in ButtonBar renderers.
Now you can use any other IICon class.
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 a65f40e jewel: promote the use of new icons and remove the need of "material" property in ButtonBar renderers. Now you can use any other IICon class.
a65f40e is described below
commit a65f40ec79a6d355bb50a0b4e8fa8cc655864ee0
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Tue Mar 31 16:21:10 2020 +0200
jewel: promote the use of new icons and remove the need of "material" property in ButtonBar renderers. Now you can use any other IICon class.
---
.../apache/royale/jewel/itemRenderers/IconButtonBarItemRenderer.as | 2 +-
.../apache/royale/jewel/itemRenderers/ToggleButtonBarItemRenderer.as | 2 +-
frameworks/projects/Jewel/src/main/sass/components/_buttonbar.sass | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/IconButtonBarItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/IconButtonBarItemRenderer.as
index f8798a0..96ec91b 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/IconButtonBarItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/IconButtonBarItemRenderer.as
@@ -76,7 +76,7 @@ package org.apache.royale.jewel.itemRenderers
{
var iconClass:Class = ValuesManager.valuesImpl.getValue((itemRendererOwnerView as ButtonBarView).buttonBar, "iconClass") as Class;
var fontIcon:IIcon = new iconClass();
- fontIcon.material = ((itemRendererOwnerView as ButtonBarView).buttonBar as IconButtonBar).material;
+ // fontIcon.material = ((itemRendererOwnerView as ButtonBarView).buttonBar as IconButtonBar).material;
fontIcon.text = value[((itemRendererOwnerView as ButtonBarView).buttonBar as IconButtonBar).iconField];
icon = fontIcon;
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ToggleButtonBarItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ToggleButtonBarItemRenderer.as
index 3c14777..479f5c1 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ToggleButtonBarItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ToggleButtonBarItemRenderer.as
@@ -76,7 +76,7 @@ package org.apache.royale.jewel.itemRenderers
{
var iconClass:Class = ValuesManager.valuesImpl.getValue((itemRendererOwnerView as ButtonBarView).buttonBar, "iconClass") as Class;
var fontIcon:IIcon = new iconClass();
- fontIcon.material = ((itemRendererOwnerView as ButtonBarView).buttonBar as ToggleButtonBar).material;
+ // fontIcon.material = ((itemRendererOwnerView as ButtonBarView).buttonBar as ToggleButtonBar).material;
fontIcon.text = value[((itemRendererOwnerView as ButtonBarView).buttonBar as ToggleButtonBar).iconField];
icon = fontIcon;
}
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_buttonbar.sass b/frameworks/projects/Jewel/src/main/sass/components/_buttonbar.sass
index 6d01725..55c30de 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_buttonbar.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_buttonbar.sass
@@ -53,11 +53,11 @@ j|ButtonBar
j|IconButtonBar
IItemRenderer: ClassReference("org.apache.royale.jewel.itemRenderers.IconButtonBarItemRenderer")
- // this requires in App to define in CSS -> iconClass: ClassReference("org.apache.royale.icons.FontIcon")
+ // this requires in App to define in CSS -> iconClass: ClassReference("org.apache.royale.icons.MaterialIcon")
// ToggleButtonBar
// ButtonVar variables
j|ToggleButtonBar
IItemRenderer: ClassReference("org.apache.royale.jewel.itemRenderers.ToggleButtonBarItemRenderer")
- // this requires in App to define in CSS -> iconClass: ClassReference("org.apache.royale.icons.FontIcon")
\ No newline at end of file
+ // this requires in App to define in CSS -> iconClass: ClassReference("org.apache.royale.icons.MaterialIcon")
\ No newline at end of file