Make ScrollPane CSS style "more specific" on some places and other sm…

…aller tweaks
dukke · Mar 15, 2021 · 908e9e2 · 908e9e2
1 parent e2ddd5a
commit 908e9e2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/FXSkins-samples/src/main/resources/com/pixelduke/samples/control/skin/ScrollPane Sample.fxml b/FXSkins-samples/src/main/resources/com/pixelduke/samples/control/skin/ScrollPane Sample.fxml
@@ -8,9 +8,9 @@
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
 
-<ScrollPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0"
-            prefWidth="521.0" xmlns="http://javafx.com/javafx/15.0.1">
+<ScrollPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="521.0" xmlns="http://javafx.com/javafx/15.0.1" xmlns:fx="http://javafx.com/fxml/1">
    <content>
       <GridPane prefHeight="620.0" prefWidth="504.0">
         <columnConstraints>
@@ -27,11 +27,21 @@
             <TextField maxWidth="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
             <Label text="123456789" GridPane.columnIndex="1" />
             <Label text="Name:" GridPane.rowIndex="1" />
-            <TextArea prefHeight="520.0" prefWidth="441.0" GridPane.columnSpan="2" GridPane.rowIndex="2" />
+            <VBox GridPane.columnSpan="2" GridPane.rowIndex="2">
+               <children>
+                  <TextArea prefHeight="520.0" prefWidth="441.0" />
+               </children>
+               <padding>
+                  <Insets top="10.0" />
+               </padding>
+            </VBox>
          </children>
          <padding>
-            <Insets left="10.0" right="10.0" />
+            <Insets bottom="15.0" left="10.0" right="10.0" />
          </padding>
+         <opaqueInsets>
+            <Insets />
+         </opaqueInsets>
       </GridPane>
    </content>
 </ScrollPane>
diff --git a/FXSkins/build.gradle b/FXSkins/build.gradle
@@ -7,7 +7,7 @@ plugins {
 
 sourceCompatibility = JavaVersion.VERSION_11
 
-version = '1.0'
+version = '1.0.0'
 def versionDescription = 'FXSkins'
 
 javafx {

diff --git a/FXSkins/src/main/resources/com/pixelduke/control/skin/fx-skins.css b/FXSkins/src/main/resources/com/pixelduke/control/skin/fx-skins.css
@@ -284,20 +284,20 @@ TextField > .right-button:hover > .right-button-graphic {
 
 /************************   Minimal ScrollBar   ********************************/
 
-.scroll-pane .minimal-scroll-bar .decrement-arrow,
-.scroll-pane .minimal-scroll-bar .increment-arrow {
+.scroll-pane > .minimal-scroll-bar .decrement-arrow,
+.scroll-pane > .minimal-scroll-bar .increment-arrow {
     -fx-pref-width: 0;
     -fx-pref-height: 0;
 }
 
-.scroll-pane .minimal-scroll-bar {
+.scroll-pane > .minimal-scroll-bar {
     -fx-background-color: transparent;
     -fx-pref-width: 8;
     -fx-pref-height: 8;
     -fx-padding: 0;
 }
 
-.scroll-pane .minimal-scroll-bar > .track-background {
+.scroll-pane > .minimal-scroll-bar > .track-background {
     -fx-background-color: transparent;
 }