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 2019/12/12 23:47:17 UTC
[royale-asjs] 16/42: jewel-buttonbar: improve styles
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
commit 21b8eb50e6d66ec91cb139c4b311bfa7ba13e9e1
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sat Nov 30 09:50:36 2019 +0100
jewel-buttonbar: improve styles
---
.../src/main/royale/ButtonBarPlayGround.mxml | 2 +-
.../projects/Jewel/src/main/resources/defaults.css | 4 ++++
.../jewel/itemRenderers/ButtonBarItemRenderer.as | 20 +++++++++++++++++---
.../Jewel/src/main/sass/components/_buttonbar.sass | 4 +++-
4 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/examples/royale/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml b/examples/royale/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml
index 5349a5a..d546be6 100644
--- a/examples/royale/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml
@@ -30,7 +30,7 @@ limitations under the License.
public var two_options:Array = ["Features", "Support"];
[Bindable]
- public var three_options:Array = ["Features", "Support", "Service & Operations"];
+ public var three_options:Array = ["Features", "Support", "Service & Operations", "four"];
]]>
</fx:Script>
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index dcc84bc..fc8aede 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -260,6 +260,10 @@ j|Alert {
IBeadView: ClassReference("org.apache.royale.jewel.beads.views.ButtonView");
}
}
+.jewel.buttonbar .jewel.button {
+ border-radius: 0;
+}
+
j|ButtonBar {
IBeadModel: ClassReference("org.apache.royale.html.beads.models.ButtonBarModel");
IBeadView: ClassReference("org.apache.royale.jewel.beads.views.ButtonBarView");
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ButtonBarItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ButtonBarItemRenderer.as
index 5d4ebcb..7d5decd 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ButtonBarItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ButtonBarItemRenderer.as
@@ -31,6 +31,7 @@ package org.apache.royale.jewel.itemRenderers
import org.apache.royale.jewel.Button;
import org.apache.royale.jewel.ButtonBar;
import org.apache.royale.jewel.beads.views.ButtonBarView;
+ import org.apache.royale.core.IItemRendererParent;
/**
* The ButtonBarItemRenderer class extends Button and turns it into an itemRenderer
@@ -74,9 +75,6 @@ package org.apache.royale.jewel.itemRenderers
_data = value;
updateButtonLabelFromData();
-
- var buttonBar:ButtonBar = (itemRendererParent as ButtonBarView).buttonBar;
- emphasis = buttonBar.emphasis;
}
/**
@@ -129,6 +127,9 @@ package org.apache.royale.jewel.itemRenderers
public function set itemRendererParent(value:Object):void
{
_itemRendererParent = value;
+
+ var buttonBar:ButtonBar = (itemRendererParent as ButtonBarView).buttonBar;
+ emphasis = buttonBar.emphasis;
}
private var _labelField:String = null;
@@ -191,6 +192,19 @@ package org.apache.royale.jewel.itemRenderers
public function set index(value:int):void
{
_index = value;
+
+ if(_index == 0)
+ {
+ addClass("first");
+ }
+ else if( _index == ( itemRendererParent as IItemRendererParent).numItemRenderers - 1 )
+ {
+ addClass("last");
+ }
+ else
+ {
+ addClass("middle");
+ }
}
private var _selectable:Boolean = true;
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_buttonbar.sass b/frameworks/projects/Jewel/src/main/sass/components/_buttonbar.sass
index 7497aaa..c5dd0d5 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_buttonbar.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_buttonbar.sass
@@ -20,7 +20,9 @@
// Jewel ButtonBar
// ButtonVar variables
-jewel.buttonbar
+.jewel.buttonbar
+ .jewel.button
+ border-radius: 0
j|ButtonBar