changeset 2206:13065026aad8

Modena: tweeks to test app, reduced controls height by 1px to better center text
author "Jasper Potts"
date Thu, 10 Jan 2013 11:27:43 -0800
parents 293f20bfaaca
children b5ae71f240fd
files apps/experiments/Modena/src/modena/Modena.css apps/experiments/Modena/src/modena/SameHeightTest.fxml apps/experiments/Modena/src/modena/SamplePage.java
diffstat 3 files changed, 20 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/apps/experiments/Modena/src/modena/Modena.css	Wed Jan 09 18:52:36 2013 -0800
+++ b/apps/experiments/Modena/src/modena/Modena.css	Thu Jan 10 11:27:43 2013 -0800
@@ -330,7 +330,7 @@
     -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color; 
     -fx-background-insets: 0, 1, 2;
     -fx-background-radius: 5, 4, 3;
-    -fx-padding: 0.333333em 1em 0.416667em 1em; /* 4 12 5 12 */
+    -fx-padding: 0.333333em 1em 0.333333em 1em; /* 4 12 4 12 */
     -fx-text-fill: -fx-text-base-color;
 }
 .button:hover,
@@ -465,7 +465,7 @@
 .choice-box > .label,
 .menu-button > .label,
 .color-picker > .label {
-    -fx-padding: 0.333333em 0.833333em 0.416667em 0.833333em; /* 4 10 5 10 */
+    -fx-padding: 0.333333em 0.833333em 0.333333em 0.833333em; /* 4 10 4 10 */
     -fx-text-fill: -fx-text-base-color;
 }
 .choice-box > .open-button,
@@ -490,8 +490,17 @@
 .list-view:focused,
 .tree-view:focused,
 .tree-table-view:focused {
+    -fx-background-color: -fx-faint-focus-color, -fx-focus-color, -fx-control-inner-background; 
+    -fx-background-insets: -2, -0.3, 1;
+}
+/* ones with grey -fx-background not lighter -fx-control-inner-background */
+.scroll-pane,
+.split-pane {
+    -fx-background-color: -fx-box-border, -fx-background;
+}
+.scroll-pane:focused,
+.split-pane:focused {
     -fx-background-color: -fx-faint-focus-color, -fx-focus-color, -fx-background; 
-    -fx-background-insets: -2, -0.3, 1;
 }
 
 /*******************************************************************************
@@ -678,7 +687,7 @@
     -fx-background-color: -fx-inner-border, -fx-body-color; 
     -fx-background-insets: 1 0 1 1, 2 1 2 2;
     -fx-background-radius: 4 0 0 4, 3 0 0 3;
-    -fx-padding: 0.333333em 0.833333em 0.416667em 0.833333em; /* 4 10 5 10 */
+    -fx-padding: 0.333333em 0.833333em 0.333333em 0.833333em; /* 4 10 4 10 */
 }
 .split-menu-button > .arrow-button {
     -fx-background-color: -fx-inner-border, -fx-body-color; 
@@ -1018,8 +1027,8 @@
     -fx-background-insets: 0, 1;
     -fx-background-radius: 2, 2;
     -fx-cursor: text;
-    -fx-padding: 0.416667em; /* 5 */
-    /* TODO USE OLD ? -fx-padding: 3 5 3 5;*/
+    /*-fx-padding: 0.416667em;  5 */
+    -fx-padding: 0.417em 0.333em 0.333em 0.333em; /* 5 4 4 4 */
 }
 .text-input:focused {
     -fx-highlight-fill: -fx-accent;
@@ -1275,7 +1284,6 @@
     -fx-effect: dropshadow(two-pass-box , rgba(255, 255, 255, 0.4), 1, 0.0 , 0, 1);
 }*/
 .tab-pane > .tab-content-area {
-    -fx-background-color: -fx-control-inner-background;
     -fx-padding: 0.0em; /* 0 */
 }
 .tab-pane > .tab-header-area > .headers-region > .tab {
@@ -1423,7 +1431,7 @@
     -fx-background: transparent;
     -fx-background-color: transparent;
     -fx-text-fill: -fx-text-base-color;
-    -fx-padding: 0.333333em 1em 0.416667em 1em; /* 4 12 5 12 */
+    -fx-padding: 0.333333em 1em 0.333333em 1em; /* 4 12 4 12 */
 }
 .combo-box-base > .arrow-button  {
     -fx-background-radius: 0 5 5 0, 0 4 4 0, 0 3 3 0;
--- a/apps/experiments/Modena/src/modena/SameHeightTest.fxml	Wed Jan 09 18:52:36 2013 -0800
+++ b/apps/experiments/Modena/src/modena/SameHeightTest.fxml	Thu Jan 10 11:27:43 2013 -0800
@@ -119,7 +119,7 @@
                 <PasswordField prefWidth="100.0" promptText="Password" text="password" />
               </children>
             </HBox>
-            <HBox maxHeight="-Infinity" prefHeight="-1.0" prefWidth="-1.0" style="">
+            <HBox maxHeight="-Infinity" prefHeight="-1.0" prefWidth="-1.0" style="" spacing="5">
               <children>
                 <Button mnemonicParsing="false" text="Button" />
                 <ToggleButton mnemonicParsing="false" prefWidth="90.0" selected="true" text="Toggle">
--- a/apps/experiments/Modena/src/modena/SamplePage.java	Wed Jan 09 18:52:36 2013 -0800
+++ b/apps/experiments/Modena/src/modena/SamplePage.java	Thu Jan 10 11:27:43 2013 -0800
@@ -352,10 +352,11 @@
                 withState(ScrollBarBuilder.create().orientation(Orientation.VERTICAL).build(), "vertical", ".thumb", "pressed")
                 );
         newDetailedSection(
-                new String[] {"ScrollPane: ", "normal", "small", "focused"}, 
+                new String[] {"ScrollPane: ", "normal", "small", "focused", "empty"}, 
                 ScrollPaneBuilder.create().content(scrollPaneContent()).build(),
                 ScrollPaneBuilder.create().content(scrollPaneContent()).minWidth(40).prefWidth(40).minHeight(40).prefHeight(40).build(),
-                withState(ScrollPaneBuilder.create().content(scrollPaneContent()).build(), "focused")
+                withState(ScrollPaneBuilder.create().content(scrollPaneContent()).build(), "focused"),
+                ScrollPaneBuilder.create().build()
                 ); 
         newDetailedSection(
                 new String[] {"Separator: ", "horizontal", "vertical"},