1.添加css路径配置。

nandem · nandem · commit f7edb235940d · 2017-08-06T17:21:48.000+08:00
2.优化逻辑。
diff --git a/dist/src/main/java/javafx/EasyInitialization.java b/dist/src/main/java/javafx/EasyInitialization.java
@@ -1,20 +1,19 @@
 package javafx;
 
-import javafx.annotation.LoadView;
+import javafx.annotation.Load;
 import javafx.annotation.MouseClicked;
 import javafx.scene.control.Control;
 import javafx.scene.layout.Pane;
 
 import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 import static javafx.utils.CommonUtil.checkNotNull;
 
 /**
- * FXML注解初始化类，通过继承本接口的实现类可以轻松地使用注解 {@link javafx.annotation.LoadView}初始化界面而不需要写冗长的初始化代码
+ * FXML注解初始化类，通过继承本接口的实现类可以轻松地使用注解 {@link Load}初始化界面而不需要写冗长的初始化代码
  *
  * 注意：
  * <ol>
@@ -23,7 +22,7 @@
  * </ol>
  *
  * @author Nandem on 2017/3/13.
- * @see javafx.annotation.LoadView
+ * @see Load
  */
 public interface EasyInitialization
 {
@@ -112,31 +111,34 @@ default void loadUI()
 
         try
         {
-            Annotation uiAnnotation = checkNotNull(clazz.getAnnotation(LoadView.class));
-            String uiPath = ((LoadView) uiAnnotation).path();
+            Annotation uiAnnotation = checkNotNull(clazz.getAnnotation(Load.class), "请指定界面文件路径");
+            String uiPath = ((Load) uiAnnotation).view();
+            String cssPath = ((Load) uiAnnotation).css();
+
             LoadUIUtil.load(uiPath, this);
+
+            if(!cssPath.equals(""))
+            {
+                loadCss(cssPath);
+            }
         }
         catch(Exception e)
         {
             //如果没有Load注解，什么都不做，他可能自己去加载
         }
+    }
 
-//        Constructor[] constructors = clazz.getConstructors();
-//
-//        for(Constructor c : constructors)
-//        {
-//            try
-//            {
-//                clazz.getAnnotation(Load.class);
-//                Annotation uiAnnotation = checkNotNull(c.getAnnotation(Load.class));
-//                String uiPath = ((Load) uiAnnotation).value();
-//                LoadUIUtil.load(uiPath, this);
-//            }
-//            catch(Exception e)
-//            {
-//                //如果没有Load注解，什么都不做，他可能自己去加载
-//            }
-//        }
+    default void loadCss(String path)
+    {
+        ((Pane) this).getStylesheets().add(getClass().getResource(path).toExternalForm());
+
+    }
+
+    default void beforeInitialize()
+    {
+        loadUI();
+        initEvent();
+        initialize();
     }
 
     default void initialize()
diff --git a/dist/src/main/java/javafx/annotation/Load.java b/dist/src/main/java/javafx/annotation/Load.java
@@ -17,7 +17,8 @@
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-public @interface LoadView
+public @interface Load
 {
-    String path() default "";
+    String view() default "";
+    String css() default "";
 }
diff --git a/dist/src/main/java/javafx/geometry/Point.java b/dist/src/main/java/javafx/geometry/Point.java
@@ -0,0 +1,68 @@
+package javafx.geometry;
+
+/**
+ * @author Nandem on 2017/8/6.
+ */
+public class Point
+{
+    private double x;
+    private double y;
+
+    public Point()
+    {
+        this.x = 0.0;
+        this.y = 0.0;
+    }
+
+    public Point(double x, double y)
+    {
+        this.x = x;
+        this.y = y;
+    }
+
+    public void update(double x, double y)
+    {
+        this.x = x;
+        this.y = y;
+    }
+
+    public void updateX(double x)
+    {
+        this.x = x;
+    }
+
+    public void updateY(double y)
+    {
+        this.y = y;
+    }
+
+    public double distance(double x1, double y1) {
+        double a = getX() - x1;
+        double b = getY() - y1;
+        return Math.sqrt(a * a + b * b);
+    }
+
+    public double distance(Point point) {
+        return distance(point.getX(), point.getY());
+    }
+
+    public double getX()
+    {
+        return x;
+    }
+
+    public void setX(double x)
+    {
+        this.x = x;
+    }
+
+    public double getY()
+    {
+        return y;
+    }
+
+    public void setY(double y)
+    {
+        this.y = y;
+    }
+}
diff --git a/dist/src/main/java/javafx/scene/layout/EasyAnchorPane.java b/dist/src/main/java/javafx/scene/layout/EasyAnchorPane.java
@@ -9,8 +9,6 @@ public abstract class EasyAnchorPane extends AnchorPane implements EasyInitializ
 {
     protected EasyAnchorPane()
     {
-        loadUI();
-        initEvent();
-        initialize();
+        beforeInitialize();
     }
 }
diff --git a/dist/src/main/java/javafx/scene/layout/EasyBorderPane.java b/dist/src/main/java/javafx/scene/layout/EasyBorderPane.java
@@ -9,8 +9,6 @@ public abstract class EasyBorderPane extends BorderPane implements EasyInitializ
 {
     protected EasyBorderPane()
     {
-        loadUI();
-        initEvent();
-        initialize();
+        beforeInitialize();
     }
 }
diff --git a/dist/src/main/java/javafx/scene/layout/EasyFlowPane.java b/dist/src/main/java/javafx/scene/layout/EasyFlowPane.java
@@ -9,8 +9,6 @@ public abstract class EasyFlowPane extends FlowPane implements EasyInitializatio
 {
     protected EasyFlowPane()
     {
-        loadUI();
-        initEvent();
-        initialize();
+        beforeInitialize();
     }
 }
diff --git a/dist/src/main/java/javafx/scene/layout/EasyGridPane.java b/dist/src/main/java/javafx/scene/layout/EasyGridPane.java
@@ -9,8 +9,6 @@ public abstract class EasyGridPane extends GridPane implements EasyInitializatio
 {
     protected EasyGridPane()
     {
-        loadUI();
-        initEvent();
-        initialize();
+        beforeInitialize();
     }
 }
diff --git a/dist/src/main/java/javafx/scene/layout/EasyPane.java b/dist/src/main/java/javafx/scene/layout/EasyPane.java
@@ -9,8 +9,6 @@ public abstract class EasyPane extends Pane implements EasyInitialization
 {
     protected EasyPane()
     {
-        loadUI();
-        initEvent();
-        initialize();
+        beforeInitialize();
     }
 }
diff --git a/dist/src/main/java/javafx/scene/layout/EasyTitledPane.java b/dist/src/main/java/javafx/scene/layout/EasyTitledPane.java
@@ -10,8 +10,6 @@ public abstract class EasyTitledPane extends TitledPane implements EasyInitializ
 {
     protected EasyTitledPane()
     {
-        loadUI();
-        initEvent();
-        initialize();
+        beforeInitialize();
     }
 }
diff --git a/example/pom.xml b/example/pom.xml
@@ -25,10 +25,11 @@
                 <directory>src/main/java</directory>
                 <includes>
                     <include>**/*.properties</include>
+                    <include>**/*.css</include>
                     <include>**/*.fxml</include>
                     <include>**/*.xml</include>
                 </includes>
-                <filtering>false</filtering>
+                <filtering>true</filtering>
             </resource>
         </resources>
     </build>
diff --git a/example/src/main/java/cloudmusic/Starter.java b/example/src/main/java/cloudmusic/Starter.java
@@ -14,7 +14,7 @@ public class Starter extends Application
     @Override
     public void start(Stage primaryStage) throws Exception
     {
-        MainView root = new MainView();
+        MainView root = new MainView(primaryStage);
         Scene scene = new Scene(root);
 
         primaryStage.setTitle("是不是要添加一个标题栏配置的功能？");
diff --git a/example/src/main/java/cloudmusic/view/MainView.java b/example/src/main/java/cloudmusic/view/MainView.java
@@ -1,44 +1,69 @@
 package cloudmusic.view;
 
-import javafx.annotation.LoadView;
-import javafx.event.EventHandler;
-import javafx.scene.input.MouseEvent;
+import javafx.annotation.Load;
+import javafx.fxml.FXML;
 import javafx.scene.layout.EasyPane;
+import javafx.scene.layout.Pane;
+import javafx.stage.Stage;
 
 /**
  * @author Nandem on 2017/7/31.
  */
-@LoadView(path = "/cloudmusic/layout/main_view.fxml")
+@Load(view = "/cloudmusic/layout/main_view.fxml", css = "/cloudmusic/css/main_view.css")
 public class MainView extends EasyPane
 {
+    private Stage stage;
+    @FXML
+    private Pane topPaneContainer;
+
+    public MainView(Stage stage)
+    {
+        this.stage = stage;
+    }
+
     @Override
     public void initialize()
     {
-        /*/
-        this.setWidth(1022);
-        this.setHeight(670);
-        //*/
+        switchUndecorated();
+    }
+
+    /*^_^*------无系统窗口时窗口拖动-----------------------------------------------------*^_^*/
+    private double xOffset = 0;
+    private double yOffset = 0;
 
+    private void switchUndecorated()
+    {
         /*
          * 拖动开始
          */
-        this.setOnMousePressed(event ->
-        {
-            System.out.println("按下");
+        this.setOnMousePressed(event -> {
+            event.consume();
+            xOffset = event.getSceneX();
+            yOffset = event.getSceneY();
         });
         /*
          * 拖动中
          */
-        this.setOnMouseDragged(event ->
-        {
-//            System.out.println("控件坐标：" + event.getX() + " | 屏幕坐标：" + event.getScreenX());
+        this.setOnMouseDragged(event -> {
+            event.consume();
+            stage.setX(event.getScreenX() - xOffset);
+            stage.setY(event.getScreenY() - yOffset);
         });
         /*
          * 拖动结束
          */
-        this.setOnMouseReleased(event ->
-        {
+        this.setOnMouseReleased(event -> {
             System.out.println("结束");
+            if(event.getScreenY() - yOffset < 0)
+            {
+                stage.setY(0);
+            }
+            /*/
+            if(event.getScreenX() - xOffset < 0)
+            {
+                stage.setX(0);
+            }
+            //*/
         });
     }
 }
diff --git a/example/src/main/resources/cloudmusic/css/main_view.css b/example/src/main/resources/cloudmusic/css/main_view.css
@@ -0,0 +1,18 @@
+#topPaneContainer
+{
+    -fx-background-color: linear-gradient(to right, #710808 0%, #B62424 50%, #710808 100%);
+}
+#topPane
+{
+    -fx-background-color: #212124;
+}
+
+#topPane Button
+{
+    -fx-background-color: transparent;
+    -fx-alignment: baseline-left;
+
+    -fx-text-fill: #FFFFFF;
+    -fx-font-size: 1.5em;
+
+}
diff --git a/example/src/main/resources/cloudmusic/layout/main_view.fxml b/example/src/main/resources/cloudmusic/layout/main_view.fxml
@@ -8,13 +8,33 @@
 <fx:root type="javafx.scene.layout.Pane" xmlns="http://javafx.com/javafx"
             xmlns:fx="http://javafx.com/fxml" prefWidth="1022" prefHeight="670">
 
-    <Button
-        prefWidth="150"
-        prefHeight="40"
-        id="test"
-        fx:id="test"
-        text="测试"
-        layoutX="100"
-        layoutY="100"/>
+    <Pane
+        id="topPaneContainer"
+        fx:id="topPaneContainer"
+        prefWidth="1022"
+        prefHeight="50">
+        <BorderPane
+            id="topPane"
+            fx:id="topPane"
+            prefWidth="1022"
+            prefHeight="48">
+            <left>
+                <FlowPane>
+                    <Button
+                        prefWidth="195"
+                        prefHeight="48"
+                        text="网易云音乐"/>
+                </FlowPane>
+            </left>
+            <right>
+                <FlowPane
+                    alignment="CENTER">
+                    <Button text="X"/>
+                    <Button text="X"/>
+                    <Button text="X"/>
+                </FlowPane>
+            </right>
+        </BorderPane>
+    </Pane>
 
 </fx:root>

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@`
`17`	`17`	`@Target(ElementType.TYPE)`
`18`	`18`	`@Retention(RetentionPolicy.RUNTIME)`
`19`	`19`	`@Documented`
`20`		`-public @interface LoadView`
	`20`	`+public @interface Load`
`21`	`21`	`{`
`22`		`- String path() default "";`
	`22`	`+ String view() default "";`
	`23`	`+ String css() default "";`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,6 @@ public abstract class EasyAnchorPane extends AnchorPane implements EasyInitializ`
`9`	`9`	`{`
`10`	`10`	`protected EasyAnchorPane()`
`11`	`11`	`{`
`12`		`- loadUI();`
`13`		`- initEvent();`
`14`		`- initialize();`
	`12`	`+ beforeInitialize();`
`15`	`13`	`}`
`16`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,6 @@ public abstract class EasyTitledPane extends TitledPane implements EasyInitializ`
`10`	`10`	`{`
`11`	`11`	`protected EasyTitledPane()`
`12`	`12`	`{`
`13`		`- loadUI();`
`14`		`- initEvent();`
`15`		`- initialize();`
	`13`	`+ beforeInitialize();`
`16`	`14`	`}`
`17`	`15`	`}`