You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pi...@apache.org on 2017/03/26 15:04:07 UTC
flex-tourjs git commit: Change TourJS main layout to use new classes
Group. Content itself do not display correct yet.
Repository: flex-tourjs
Updated Branches:
refs/heads/develop 6aaba46cf -> 3232dac95
Change TourJS main layout to use new classes Group. Content itself do not display correct yet.
Project: http://git-wip-us.apache.org/repos/asf/flex-tourjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-tourjs/commit/3232dac9
Tree: http://git-wip-us.apache.org/repos/asf/flex-tourjs/tree/3232dac9
Diff: http://git-wip-us.apache.org/repos/asf/flex-tourjs/diff/3232dac9
Branch: refs/heads/develop
Commit: 3232dac954de12654060d902a650cc16fcc07f2a
Parents: 6aaba46
Author: piotrz <pi...@apache.org>
Authored: Sun Mar 26 17:04:03 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Sun Mar 26 17:04:03 2017 +0200
----------------------------------------------------------------------
TourJS/src/main/flex/TourJS.mxml | 4 ++-
TourJS/src/main/flex/TourJSMainView.mxml | 38 +++++++++++++++------------
2 files changed, 24 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-tourjs/blob/3232dac9/TourJS/src/main/flex/TourJS.mxml
----------------------------------------------------------------------
diff --git a/TourJS/src/main/flex/TourJS.mxml b/TourJS/src/main/flex/TourJS.mxml
index 63db665..7ffa5de 100644
--- a/TourJS/src/main/flex/TourJS.mxml
+++ b/TourJS/src/main/flex/TourJS.mxml
@@ -25,7 +25,9 @@ limitations under the License.
<js:SimpleCSSValuesImpl />
</js:valuesImpl>
<js:initialView>
- <local:TourJSMainView id="mainView" />
+ <js:View>
+ <local:TourJSMainView id="mainView" />
+ </js:View>
</js:initialView>
<!--<js:model>
<models:ASDocModel />
http://git-wip-us.apache.org/repos/asf/flex-tourjs/blob/3232dac9/TourJS/src/main/flex/TourJSMainView.mxml
----------------------------------------------------------------------
diff --git a/TourJS/src/main/flex/TourJSMainView.mxml b/TourJS/src/main/flex/TourJSMainView.mxml
index 749b671..9f32b54 100644
--- a/TourJS/src/main/flex/TourJSMainView.mxml
+++ b/TourJS/src/main/flex/TourJSMainView.mxml
@@ -17,10 +17,10 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-<express:HView xmlns:fx="http://ns.adobe.com/mxml/2009"
+<js:Group xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:js="library://ns.apache.org/flexjs/basic"
xmlns:express="org.apache.flex.express.*"
- width="100%" height="100%"
+ width="100%"
initComplete="loadInitialData()">
<fx:Script>
<![CDATA[
@@ -132,34 +132,38 @@ limitations under the License.
}
</fx:Style>
- <express:beads>
+ <js:beads>
+ <js:HorizontalFlexLayout />
<js:HTTPService id="service" />
<js:HTTPService id="codeLoader" />
- </express:beads>
+ </js:beads>
- <js:Panel title="Component Explorer" width="25%" height="100%" className="Explorer">
+ <js:Panel title="Component Explorer" width="25%" className="Explorer">
<js:Tree id="contentTree" width="100%"
- height="100%"
- labelField="title"
+ labelField="title"
className="ExplorerTree"
change="treeChange()"/>
</js:Panel>
- <js:VContainer width="74%" height="100%">
- <js:Panel id="topPanel" title="Example" width="100%" height="50%" className="RunningExample">
+ <js:Group width="74%">
+ <js:beads>
+ <js:VerticalFlexLayout/>
+ </js:beads>
+ <js:Panel id="topPanel" title="Example" width="100%" className="RunningExample">
<js:SubAppLoader id="exampleApp" width="100%" height="100%" />
</js:Panel>
- <js:VContainer width="100%" height="50%">
- <js:ButtonBar id="buttonBar" width="100%" height="10%" change="changeExample()" />
- <js:Container width="100%" className="ExampleCode" height="90%">
+ <js:Group width="100%">
+ <js:beads>
+ <js:VerticalFlexLayout/>
+ </js:beads>
+ <js:ButtonBar id="buttonBar" width="100%" change="changeExample()" />
+ <js:Container width="100%" className="ExampleCode">
<js:beads>
<js:ScrollingViewport />
</js:beads>
<express:MXMLViewer id="codeArea" width="100%"/>
</js:Container>
- </js:VContainer>
-
- </js:VContainer>
-
-</express:HView>
+ </js:Group>
+ </js:Group>
+</js:Group>