changeset 5632:bbed405cc8bd

RT-34057 Modena: align table in floating tab pane
author dmasada
date Mon, 04 Nov 2013 22:25:37 -0800
parents 3d78391f8a73
children 15f5f2930c25
files apps/experiments/Modena/src/main/resources/modena/CombinationTest.fxml modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/modena.css
diffstat 2 files changed, 49 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/apps/experiments/Modena/src/main/resources/modena/CombinationTest.fxml	Mon Nov 04 21:13:50 2013 -0800
+++ b/apps/experiments/Modena/src/main/resources/modena/CombinationTest.fxml	Mon Nov 04 22:25:37 2013 -0800
@@ -50,6 +50,43 @@
     </Label>
     <TilePane hgap="10.0" prefColumns="3" prefHeight="-1.0" prefTileHeight="300.0" prefTileWidth="300.0" prefWidth="-1.0" vgap="10.0">
       <children>
+        <TabPane prefHeight="200.0" prefWidth="200.0" styleClass="floating" tabClosingPolicy="UNAVAILABLE">
+          <tabs>
+            <Tab text="ScrollPane">
+              <content>
+                <ScrollPane prefHeight="200.0" prefWidth="200.0">
+                  <content>
+                    <Pane prefHeight="1000.0" prefWidth="1000.0" />
+                  </content>
+                </ScrollPane>
+              </content>
+            </Tab>
+            <Tab text="Untitled Tab 2">
+              <content>
+                <AnchorPane id="Content" minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
+              </content>
+            </Tab>
+          </tabs>
+        </TabPane>
+        <TabPane prefHeight="200.0" prefWidth="200.0" styleClass="floating" tabClosingPolicy="UNAVAILABLE">
+          <tabs>
+            <Tab text="ScrollPane">
+              <content>
+                <TableView prefHeight="200.0" prefWidth="200.0">
+                  <columns>
+                    <TableColumn prefWidth="75.0" text="Column X" />
+                    <TableColumn prefWidth="75.0" text="Column X" />
+                  </columns>
+                </TableView>
+              </content>
+            </Tab>
+            <Tab text="Untitled Tab 2">
+              <content>
+                <AnchorPane id="Content" minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
+              </content>
+            </Tab>
+          </tabs>
+        </TabPane>
         <TabPane prefHeight="200.0" prefWidth="200.0" tabClosingPolicy="UNAVAILABLE">
           <tabs>
             <Tab text="ScrollPane">
--- a/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/modena.css	Mon Nov 04 21:13:50 2013 -0800
+++ b/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/modena.css	Mon Nov 04 22:25:37 2013 -0800
@@ -1682,7 +1682,7 @@
 .tab-pane.floating > .tab-content-area {
     -fx-background-color: -fx-outer-border, -fx-background;
     -fx-background-insets: 0, 1;
-    -fx-background-radius: 3, 2;
+    -fx-background-radius: 2, 0;
     -fx-padding: 2;
 }
 
@@ -2906,6 +2906,17 @@
     -fx-background-insets: 0, 0;
     -fx-padding: 0;
  }
+.tab-pane.floating > * > .table-view,
+.tab-pane.floating > * > .tree-table-view,
+.tab-pane.floating > * > .list-view,
+.tab-pane.floating > * > .tree-view,
+.tab-pane.floating > * > .scroll-pane,
+.tab-pane.floating > * > .split-pane,
+.tab-pane.floating > * > .text-area,
+.tab-pane.floating > * > .html-editor {
+    -fx-background-insets: 0, 0;
+    -fx-padding: -1;
+}
 .split-pane > * > .accordion > .titled-pane > *.content {
     -fx-border-color: null;
     -fx-border-insets: 0;