changeset 2326:b11de5fd3149

Modena Tweaks
author mo.chicharro
date Fri, 18 Jan 2013 21:36:43 +0000
parents 83a8d540e79d
children 521518548a66
files apps/experiments/Modena/src/modena/Modena.css apps/experiments/Modena/src/modena/SameHeightTest.fxml apps/experiments/Modena/src/modena/ui-mosaic.fxml
diffstat 3 files changed, 42 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/apps/experiments/Modena/src/modena/Modena.css	Sat Jan 19 10:08:14 2013 +1300
+++ b/apps/experiments/Modena/src/modena/Modena.css	Fri Jan 18 21:36:43 2013 +0000
@@ -1514,7 +1514,7 @@
     -fx-background-color: -fx-box-border, -fx-inner-border, -fx-body-color;
     -fx-background-insets: 0, 1, 2;
     -fx-background-radius: 5 5 0 0, 4 4 0 0, 3 3 0 0;
-    -fx-padding: 0.166667em 0.833333em 0.25em 0.833333em; /* 2 10 3 10 */
+    -fx-padding: 0.417em 0.75em 0.5em 0.75em; /* 5 9 6 9 */
 }
 .titled-pane:focused > .title {
     -fx-color: -fx-focus-color;
@@ -1523,7 +1523,7 @@
     -fx-background-color: null;
     -fx-background-insets: 0;
     -fx-background-radius: 0;
-    -fx-padding: 0.0em 0.25em 0.0em 0.0em; /* 0 3 0 0 */
+    -fx-padding: 0.0em 0.583em 0.0em 0.0em; /* 0 7 0 0 */
 }
 .titled-pane > .title > .arrow-button > .arrow {
     -fx-background-color: -fx-mark-highlight-color, -fx-mark-color;
--- a/apps/experiments/Modena/src/modena/SameHeightTest.fxml	Sat Jan 19 10:08:14 2013 +1300
+++ b/apps/experiments/Modena/src/modena/SameHeightTest.fxml	Fri Jan 18 21:36:43 2013 +0000
@@ -190,6 +190,11 @@
                         <TextField prefWidth="80.0" promptText="Textfield" text="Sample" />
                         <PasswordField prefWidth="80.0" promptText="Sample" text="" />
                         <TextArea prefHeight="50.0" prefWidth="80.0" text="Sample" wrapText="true" />
+                        <TitledPane animated="false" prefWidth="80.0" text="Sample">
+                          <content>
+                            <AnchorPane id="Content" minHeight="0.0" minWidth="0.0" prefHeight="40.0" prefWidth="80.0" />
+                          </content>
+                        </TitledPane>
                         <ToggleButton mnemonicParsing="false" prefWidth="90.0" selected="true" text="Toggle">
                           <toggleGroup>
                             <ToggleGroup />
@@ -237,6 +242,16 @@
                     <TextField maxWidth="100.0" prefWidth="100.0" text="Sample" />
                     <PasswordField maxWidth="100.0" prefWidth="100.0" promptText="Sample" text="" />
                     <TextArea maxWidth="100.0" prefHeight="50.0" prefRowCount="10" prefWidth="100.0" text="Sample" wrapText="true" />
+                    <TitledPane animated="false" collapsible="false" maxWidth="100.0" prefWidth="100.0" text="Sample">
+                      <content>
+                        <AnchorPane id="Content" maxWidth="100.0" minHeight="0.0" minWidth="0.0" prefHeight="40.0" prefWidth="100.0" />
+                      </content>
+                    </TitledPane>
+                    <TitledPane animated="false" maxWidth="100.0" prefWidth="100.0" text="Sample">
+                      <content>
+                        <AnchorPane id="Content" maxWidth="100.0" minHeight="0.0" minWidth="0.0" prefHeight="40.0" prefWidth="100.0" />
+                      </content>
+                    </TitledPane>
                     <MenuButton maxWidth="100.0" mnemonicParsing="false" prefWidth="100.0" text="Sample">
                       <items>
                         <MenuItem mnemonicParsing="false" text="Sample MenuButton Item 1" />
--- a/apps/experiments/Modena/src/modena/ui-mosaic.fxml	Sat Jan 19 10:08:14 2013 +1300
+++ b/apps/experiments/Modena/src/modena/ui-mosaic.fxml	Fri Jan 18 21:36:43 2013 +0000
@@ -4,6 +4,7 @@
 <?import java.util.*?>
 <?import javafx.collections.*?>
 <?import javafx.geometry.*?>
+<?import javafx.scene.chart.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.paint.*?>
@@ -41,28 +42,41 @@
         <ToggleGroup fx:id="toggle1" />
       </toggleGroup>
     </ToggleButton>
-    <Accordion layoutX="693.0" layoutY="362.0">
-      <expandedPane>
-        <TitledPane fx:id="x1" animated="false" expanded="true" text="untitled">
+    <TitledPane animated="false" layoutX="682.0" layoutY="298.0" prefHeight="59.0" prefWidth="216.0" text="Hello World">
+      <content>
+        <AnchorPane id="Content" minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
+      </content>
+    </TitledPane>
+    <Accordion expandedPane="$null" layoutX="551.0" layoutY="382.0" prefHeight="270.0" prefWidth="347.0">
+      <panes>
+        <TitledPane fx:id="x1" animated="false" expanded="false" text="Empty">
           <content>
             <AnchorPane id="Content" minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
           </content>
         </TitledPane>
-      </expandedPane>
-      <panes>
-        <fx:reference source="x1" />
-        <TitledPane animated="false" expanded="false" text="untitled">
+        <TitledPane animated="false" expanded="false" text="Chart">
           <content>
             <ScrollPane prefHeight="200.0" prefWidth="200.0">
               <content>
-                <AnchorPane id="Content" minHeight="0.0" minWidth="0.0" prefHeight="200.0" prefWidth="200.0" />
+                <BubbleChart id="BubbleChart" title="My Bubble Chart" titleSide="TOP">
+                  <xAxis>
+                    <NumberAxis side="BOTTOM" />
+                  </xAxis>
+                  <yAxis>
+                    <NumberAxis side="LEFT" />
+                  </yAxis>
+                </BubbleChart>
               </content>
             </ScrollPane>
           </content>
         </TitledPane>
-        <TitledPane animated="false" expanded="false" text="untitled">
+        <TitledPane animated="false" expanded="false" text="Button">
           <content>
-            <AnchorPane id="Content" minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
+            <AnchorPane id="Content" minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
+              <children>
+                <Button layoutX="140.0" layoutY="89.0" mnemonicParsing="false" text="Button" />
+              </children>
+            </AnchorPane>
           </content>
         </TitledPane>
       </panes>
@@ -88,7 +102,7 @@
         </FXCollections>
       </items>
     </ComboBox>
-    <ProgressIndicator layoutX="571.0" layoutY="367.0" prefHeight="59.0" prefWidth="56.0" progress="-1.0" />
+    <ProgressIndicator layoutX="582.0" layoutY="300.0" prefHeight="59.0" prefWidth="56.0" progress="-1.0" />
     <SplitPane dividerPositions="0.5086505190311419" focusTraversable="true" layoutX="39.0" layoutY="361.0" orientation="VERTICAL" prefHeight="291.0" prefWidth="447.0">
       <items>
         <SplitPane dividerPositions="0.49435665914221216" focusTraversable="true" prefHeight="172.0" prefWidth="490.0">