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 2018/05/05 20:01:44 UTC
[royale-asjs] branch feature/refactor-separation-core-basic
updated: fix layout some issue with layout due to forgotten GroupView
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch feature/refactor-separation-core-basic
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/feature/refactor-separation-core-basic by this push:
new a77786f fix layout some issue with layout due to forgotten GroupView
a77786f is described below
commit a77786f87d2487e15178ecf10ff0e52716d1dd8a
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sat May 5 22:01:39 2018 +0200
fix layout some issue with layout due to forgotten GroupView
---
.../JewelExample/src/main/royale/AlertPlayGround.mxml | 4 ++--
examples/royale/JewelExample/src/main/royale/App.mxml | 4 ++--
.../src/main/royale/ButtonPlayGround.mxml | 4 ++--
.../src/main/royale/CheckBoxPlayGround.mxml | 4 ++--
.../src/main/royale/DropDownListPlayGround.mxml | 2 +-
.../JewelExample/src/main/royale/HeadingsAndText.mxml | 4 ++--
.../JewelExample/src/main/royale/LabelPlayGround.mxml | 4 ++--
.../JewelExample/src/main/royale/ListPlayGround.mxml | 4 ++--
.../JewelExample/src/main/royale/MainContent.mxml | 19 ++++++++++---------
.../src/main/royale/RadioButtonPlayGround.mxml | 4 ++--
.../src/main/royale/SliderPlayGround.mxml | 4 ++--
.../src/main/royale/TextInputPlayGround.mxml | 12 ++++++------
.../projects/Jewel/src/main/resources/defaults.css | 4 ++++
frameworks/projects/Jewel/src/main/sass/_global.sass | 2 ++
14 files changed, 41 insertions(+), 34 deletions(-)
diff --git a/examples/royale/JewelExample/src/main/royale/AlertPlayGround.mxml b/examples/royale/JewelExample/src/main/royale/AlertPlayGround.mxml
index c53a75a..257674f 100644
--- a/examples/royale/JewelExample/src/main/royale/AlertPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/AlertPlayGround.mxml
@@ -46,9 +46,9 @@ limitations under the License.
]]>
</fx:Script>
- <!-- <j:beads>
+ <j:beads>
<j:VerticalLayoutWithPaddingAndGap gap="10"/>
- </j:beads> -->
+ </j:beads>
<html:H3 text="Jewel Alert"/>
diff --git a/examples/royale/JewelExample/src/main/royale/App.mxml b/examples/royale/JewelExample/src/main/royale/App.mxml
index f223fa1..c358c9e 100644
--- a/examples/royale/JewelExample/src/main/royale/App.mxml
+++ b/examples/royale/JewelExample/src/main/royale/App.mxml
@@ -31,9 +31,9 @@
</j:valuesImpl>
<j:initialView>
<js:View>
- <!-- <j:beads>
+ <j:beads>
<j:VerticalLayoutWithPaddingAndGap gap="10"/>
- </j:beads> -->
+ </j:beads>
<html:H1 text="Apache Royale Jewel UI Set Theme Showcase"/>
<local:MainContent/>
</js:View>
diff --git a/examples/royale/JewelExample/src/main/royale/ButtonPlayGround.mxml b/examples/royale/JewelExample/src/main/royale/ButtonPlayGround.mxml
index 222eef6..4e40bb6 100644
--- a/examples/royale/JewelExample/src/main/royale/ButtonPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/ButtonPlayGround.mxml
@@ -30,9 +30,9 @@ limitations under the License.
]]>
</fx:Script>
- <!-- <j:beads>
+ <j:beads>
<j:VerticalLayoutWithPaddingAndGap gap="10"/>
- </j:beads> -->
+ </j:beads>
<html:H3 text="Jewel Button"/>
diff --git a/examples/royale/JewelExample/src/main/royale/CheckBoxPlayGround.mxml b/examples/royale/JewelExample/src/main/royale/CheckBoxPlayGround.mxml
index cf35fce..7ed747b 100644
--- a/examples/royale/JewelExample/src/main/royale/CheckBoxPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/CheckBoxPlayGround.mxml
@@ -23,9 +23,9 @@ limitations under the License.
xmlns:j="library://ns.apache.org/royale/jewel"
className="container">
- <!-- <j:beads>
+ <j:beads>
<j:VerticalLayoutWithPaddingAndGap gap="10"/>
- </j:beads> -->
+ </j:beads>
<html:H3 text="Jewel CheckBox"/>
diff --git a/examples/royale/JewelExample/src/main/royale/DropDownListPlayGround.mxml b/examples/royale/JewelExample/src/main/royale/DropDownListPlayGround.mxml
index 8ff300d..ff30a72 100644
--- a/examples/royale/JewelExample/src/main/royale/DropDownListPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/DropDownListPlayGround.mxml
@@ -41,7 +41,7 @@ limitations under the License.
</fx:Script>
<j:beads>
- <!-- <j:HorizontalLayoutWithPaddingAndGap gap="10"/> -->
+ <j:HorizontalLayoutWithPaddingAndGap gap="10"/>
<js:ViewDataBinding />
</j:beads>
diff --git a/examples/royale/JewelExample/src/main/royale/HeadingsAndText.mxml b/examples/royale/JewelExample/src/main/royale/HeadingsAndText.mxml
index 33aa449..3209e85 100644
--- a/examples/royale/JewelExample/src/main/royale/HeadingsAndText.mxml
+++ b/examples/royale/JewelExample/src/main/royale/HeadingsAndText.mxml
@@ -22,9 +22,9 @@ limitations under the License.
xmlns:j="library://ns.apache.org/royale/jewel"
className="container" width="350">
- <!-- <j:beads>
+ <j:beads>
<j:VerticalLayoutWithPaddingAndGap gap="10"/>
- </j:beads> -->
+ </j:beads>
<html:H3 text="Headings and text"/>
diff --git a/examples/royale/JewelExample/src/main/royale/LabelPlayGround.mxml b/examples/royale/JewelExample/src/main/royale/LabelPlayGround.mxml
index 3413555..7d4a27a 100644
--- a/examples/royale/JewelExample/src/main/royale/LabelPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/LabelPlayGround.mxml
@@ -33,9 +33,9 @@ limitations under the License.
]]>
</fx:Script>
- <!-- <j:beads>
+ <j:beads>
<j:VerticalLayoutWithPaddingAndGap gap="10"/>
- </j:beads> -->
+ </j:beads>
<html:H3 text="Jewel Label"/>
diff --git a/examples/royale/JewelExample/src/main/royale/ListPlayGround.mxml b/examples/royale/JewelExample/src/main/royale/ListPlayGround.mxml
index f3e6a0a..0e0564c 100644
--- a/examples/royale/JewelExample/src/main/royale/ListPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/ListPlayGround.mxml
@@ -40,9 +40,9 @@ limitations under the License.
<models:ListsModel/>
</j:model>
- <!-- <j:beads>
+ <j:beads>
<j:VerticalLayoutWithPaddingAndGap gap="10"/>
- </j:beads> -->
+ </j:beads>
<html:H3 text="Jewel List"/>
diff --git a/examples/royale/JewelExample/src/main/royale/MainContent.mxml b/examples/royale/JewelExample/src/main/royale/MainContent.mxml
index 9e6e9b9..74c86d5 100644
--- a/examples/royale/JewelExample/src/main/royale/MainContent.mxml
+++ b/examples/royale/JewelExample/src/main/royale/MainContent.mxml
@@ -19,42 +19,43 @@ limitations under the License.
-->
<j:Group xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:j="library://ns.apache.org/royale/jewel"
+ xmlns:js="library://ns.apache.org/royale/basic"
xmlns:local="*">
<j:beads>
- <j:HorizontalLayoutWithPaddingAndGap gap="10"/>
+ <js:HorizontalLayoutWithPaddingAndGap gap="10"/>
</j:beads>
<j:Group>
- <!-- <j:beads>
+ <j:beads>
<j:VerticalLayoutWithPaddingAndGap gap="10"/>
- </j:beads> -->
+ </j:beads>
<local:LabelPlayGround/>
<local:ButtonPlayGround/>
<local:DropDownListPlayGround/>
</j:Group>
<j:Group>
- <!-- <j:beads>
+ <j:beads>
<j:VerticalLayoutWithPaddingAndGap gap="10"/>
- </j:beads> -->
+ </j:beads>
<local:TextInputPlayGround/>
<local:CheckBoxPlayGround/>
<local:RadioButtonPlayGround/>
</j:Group>
<j:Group>
- <!-- <j:beads>
+ <j:beads>
<j:VerticalLayoutWithPaddingAndGap gap="10"/>
- </j:beads> -->
+ </j:beads>
<local:SliderPlayGround/>
<local:ListPlayGround/>
</j:Group>
<j:Group>
- <!-- <j:beads>
+ <j:beads>
<j:VerticalLayoutWithPaddingAndGap gap="10"/>
- </j:beads> -->
+ </j:beads>
<local:AlertPlayGround/>
<local:HeadingsAndText/>
</j:Group>
diff --git a/examples/royale/JewelExample/src/main/royale/RadioButtonPlayGround.mxml b/examples/royale/JewelExample/src/main/royale/RadioButtonPlayGround.mxml
index 021675f..6b4b89d 100644
--- a/examples/royale/JewelExample/src/main/royale/RadioButtonPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/RadioButtonPlayGround.mxml
@@ -22,10 +22,10 @@ limitations under the License.
xmlns:j="library://ns.apache.org/royale/jewel"
className="container">
- <!-- <j:beads>
+ <j:beads>
<j:VerticalLayoutWithPaddingAndGap gap="10"/>
</j:beads>
- -->
+
<html:H3 text="Jewel RadioButton"/>
<j:RadioButton text="RadioButton 1" groupName="radios" value="Test 1"/>
diff --git a/examples/royale/JewelExample/src/main/royale/SliderPlayGround.mxml b/examples/royale/JewelExample/src/main/royale/SliderPlayGround.mxml
index c15c752..c3283d7 100644
--- a/examples/royale/JewelExample/src/main/royale/SliderPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/SliderPlayGround.mxml
@@ -52,9 +52,9 @@ limitations under the License.
]]>
</fx:Script>
- <!-- <j:beads>
+ <j:beads>
<j:VerticalLayoutWithPaddingAndGap gap="10"/>
- </j:beads> -->
+ </j:beads>
<html:H3 text="Jewel Slider"/>
diff --git a/examples/royale/JewelExample/src/main/royale/TextInputPlayGround.mxml b/examples/royale/JewelExample/src/main/royale/TextInputPlayGround.mxml
index bfdc7ef..c92f126 100644
--- a/examples/royale/JewelExample/src/main/royale/TextInputPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/TextInputPlayGround.mxml
@@ -22,24 +22,24 @@ limitations under the License.
xmlns:j="library://ns.apache.org/royale/jewel"
className="container">
- <!-- <j:beads>
+ <j:beads>
<j:VerticalLayoutWithPaddingAndGap gap="10"/>
- </j:beads> -->
+ </j:beads>
<html:H3 text="Jewel TextInput"/>
<j:Group>
- <!-- <j:beads>
+ <j:beads>
<j:HorizontalLayoutWithPaddingAndGap gap="10"/>
- </j:beads> -->
+ </j:beads>
<j:Button text="Check it!" primary="true"/>
<j:TextInput text="A TextInput"/>
</j:Group>
<j:Group>
- <!-- <j:beads>
+ <j:beads>
<j:HorizontalLayoutWithPaddingAndGap gap="10"/>
- </j:beads> -->
+ </j:beads>
<j:TextInput>
<j:beads>
<j:TextPromptBead prompt="With prompt..."/>
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index f7e9f5b..c828aec 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -36,6 +36,10 @@
align-items: flex-start;
}
+j|Group {
+ IBeadView: ClassReference("org.apache.royale.core.beads.GroupView");
+}
+
.jewel.alert {
display: block;
position: fixed;
diff --git a/frameworks/projects/Jewel/src/main/sass/_global.sass b/frameworks/projects/Jewel/src/main/sass/_global.sass
index 19b9d16..58fe0b5 100644
--- a/frameworks/projects/Jewel/src/main/sass/_global.sass
+++ b/frameworks/projects/Jewel/src/main/sass/_global.sass
@@ -35,3 +35,5 @@
align-items: flex-start
+j|Group
+ IBeadView: ClassReference("org.apache.royale.core.beads.GroupView")
--
To stop receiving notification emails like this one, please contact
carlosrovira@apache.org.