remove SubScene

leewyatt · Dec 29, 2022 · 9d6a45e · 9d6a45e
1 parent 19e6762
commit 9d6a45e
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -11,6 +11,19 @@
 >QQ:  **9670453**  <br />
 JavaFX QQ群: **518914410** <br/>
 
+主要变化:
+    RXCarousel 去掉SubScene (css name: .carousel-subscene)
+    考虑到一个界面可能有多个轮播图,避免层级过多;
+    如果想要部分的专场效果,有3D的感觉, 那么可以在Scene里设置;
+Main changes: 
+    RXCarousel removes SubScene (css name: .carousel-subscene) 
+    Considering that an interface may have multiple carousels to avoid too many layers; 
+    if you want some special effects and a 3D feeling, Need to set a perspective camera for setting the main scene graph;
+```java
+scene.setCamera(new PerspectiveCamera()); 
+```
+
+
 Maven dependency
 ```xml
     <repositories>
@@ -25,7 +38,7 @@ Maven dependency
             <groupId>com.github.leewyatt</groupId>
             <artifactId>rxcontrols</artifactId>
             <!-- 11.x.y -->
-            <version>11.0.2</version>
+            <version>11.0.3</version>
         </dependency>
     </dependencies>
 ```

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.github.leewyatt</groupId>
     <artifactId>rxcontrols</artifactId>
-    <version>11.0.2</version>
+    <version>11.0.3</version>
     <packaging>jar</packaging>
     <dependencies>
 

diff --git a/src/main/java/com/leewyatt/rxcontrols/controls/RXCarousel.java b/src/main/java/com/leewyatt/rxcontrols/controls/RXCarousel.java
@@ -486,8 +486,16 @@ public List<RXToggleButton> getNavButtons() {
         return skin.getNavButtons();
     }
 
+    /**
+     * 之前使用SubScene 然后添加透视相机, 有3D的效果
+     * 但是考虑到一个页面,或者一个界面可能有多个轮播图,所以取消了SubScene
+     * 可以自行根据需要跟Scene一个透视相机, 或者自己创建一个SubScene 添加透视相机, 来实现;
+     * 避免了多个SubScene
+     * @return null
+     */
+    @Deprecated
     public SubScene getSubScene() {
-        return skin.getSubScene();
+        return null;
     }
 
     /**

diff --git a/src/main/java/com/leewyatt/rxcontrols/controls/RXCarouselSkin.java b/src/main/java/com/leewyatt/rxcontrols/controls/RXCarouselSkin.java
@@ -44,8 +44,6 @@
 import javafx.geometry.Orientation;
 import javafx.geometry.VPos;
 import javafx.scene.Node;
-import javafx.scene.PerspectiveCamera;
-import javafx.scene.SceneAntialiasing;
 import javafx.scene.SubScene;
 import javafx.scene.control.SkinBase;
 import javafx.scene.control.Toggle;
@@ -76,10 +74,7 @@ public class RXCarouselSkin extends SkinBase<RXCarousel> {
 
     private RXCarousel control;
     private ObservableList<RXCarouselPane> paneList;
-    /**
-     * 子场景图
-     */
-    private final SubScene subScene;
+
     /**
      * 场景图上的根节点(包含内容面板,效果面板,遮挡面板,导航面板)
      */
@@ -204,9 +199,7 @@ public RXCarouselSkin(RXCarousel control) {
 
         navigationPane.getChildren().setAll(leftButton, rightButton, navBar);
         // 裁剪容器(避免显示的部分超出容器的范围)
-        //SubScene 已经实现了裁剪的效果
-//        clipRegion(control);
-//        clipRegion(rootPane);
+        clipRegion(rootPane);
 
         // 绑定宽高
         DoubleProperty dbw = control.prefWidthProperty();
@@ -221,13 +214,16 @@ public RXCarouselSkin(RXCarousel control) {
             clipRegion(pane);
         }*/
         // 添加底层容器到组件里
-        subScene = new SubScene(contentPane, dbw.get(), dbh.get(), false, SceneAntialiasing.BALANCED);
-        subScene.getStyleClass().add("carousel-subscene");
-        rootPane.getChildren().addAll(subScene, effectPane, navigationPane);
-        contentPane.backgroundProperty().bind(control.backgroundProperty());
-        subScene.widthProperty().bind(control.prefWidthProperty());
-        subScene.heightProperty().bind(control.prefHeightProperty());
-        subScene.setCamera(new PerspectiveCamera());
+        rootPane.getChildren().addAll(contentPane, effectPane, navigationPane);
+        rootPane.backgroundProperty().bind(control.backgroundProperty());
+
+        //subScene = new SubScene(contentPane, dbw.get(), dbh.get(), false, SceneAntialiasing.BALANCED);
+        //subScene.getStyleClass().add("carousel-subscene");
+        //rootPane.getChildren().addAll(subScene, effectPane, navigationPane);
+        //contentPane.backgroundProperty().bind(control.backgroundProperty());
+        //subScene.widthProperty().bind(control.prefWidthProperty());
+        //subScene.heightProperty().bind(control.prefHeightProperty());
+        //subScene.setCamera(new PerspectiveCamera());
 
         getChildren().setAll(rootPane);
         getSkinnable().requestLayout();
@@ -677,8 +673,8 @@ public void dispose() {
             button.textProperty().unbind();
         }
         contentPane.backgroundProperty().unbind();
-        subScene.widthProperty().unbind();
-        subScene.heightProperty().unbind();
+        contentPane.prefWidthProperty().unbind();
+        contentPane.prefHeightProperty().unbind();
         rootPane.minWidthProperty().unbind();
         rootPane.prefWidthProperty().unbind();
         rootPane.minHeightProperty().unbind();
@@ -706,7 +702,12 @@ public void dispose() {
         super.dispose();
     }
 
+    /**
+     * 移除SubScene, 要向轮播图有3D效果,请自行给Scene添加透视相机 PerspectiveCamera
+     * @return null
+     */
+    @Deprecated
     public SubScene getSubScene() {
-        return subScene;
+        return null;
     }
 }
diff --git a/src/test/java/app/ui/MainTest.java b/src/test/java/app/ui/MainTest.java
@@ -27,6 +27,7 @@
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
+import javafx.scene.PerspectiveCamera;
 import javafx.scene.Scene;
 import javafx.scene.paint.Color;
 import javafx.stage.Stage;
@@ -42,6 +43,7 @@ public void start(Stage primaryStage) throws IOException {
         Scene scene = new Scene(root);
         scene.setFill(Color.TRANSPARENT);
         scene.setUserData(this.getHostServices());
+        scene.setCamera(new PerspectiveCamera());
         primaryStage.setScene(scene);
         primaryStage.initStyle(StageStyle.TRANSPARENT);
         primaryStage.setTitle("MainTest Window");