From 136947bf5fe9034a4d2512b85200e1fae79a0124 Mon Sep 17 00:00:00 2001
From: liwen <lwdillon@163.com>
Date: Tue, 3 Nov 2020 09:49:23 +0800
Subject: [PATCH] test

---
 .../executionHistory/executionHistory.bin     | Bin 125987 -> 125987 bytes
 .../executionHistory/executionHistory.lock    | Bin 17 -> 17 bytes
 .../gui/uicomponents/main/MainController.java |   2 +
 client/src/test/java/TestFx.java              |  35 ++++++++----------
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/.gradle/6.4.1/executionHistory/executionHistory.bin b/.gradle/6.4.1/executionHistory/executionHistory.bin
index 0740d30028be45b76579230c5ec084de6e4d6d2e..b5bc9790cdcce3167804823472ab901f187f52c9 100644
GIT binary patch
delta 53
zcmZ2{gMIN0_6`0XO8F+0S*1qhruj+9IY|YXRf%S4g{6sE>4hc?5U{<u&|`a{2jiy2
E03%xy4*&oF

delta 53
zcmZ2{gMIN0_6`0XN_l3f=_cm+CMHE`<`wywl}0JW*~SIsC8?<l5TMmu=&`-fgK^Vh
E00xc`@Bjb+

diff --git a/.gradle/6.4.1/executionHistory/executionHistory.lock b/.gradle/6.4.1/executionHistory/executionHistory.lock
index e2ee71f811aa2d1938c15a359dbe5f2f6702c3ea..ac42924b0c5535b3ca6aea77e7d962db40046f6a 100644
GIT binary patch
literal 17
UcmZRMshM#9O`>-U0|Yn&05&58f&c&j

literal 17
UcmZRMshM#9O`>-U0|Yn#05%{5e*gdg

diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/main/MainController.java b/client/src/main/java/com/epri/fx/client/gui/uicomponents/main/MainController.java
index 69d6d06..54fdc66 100644
--- a/client/src/main/java/com/epri/fx/client/gui/uicomponents/main/MainController.java
+++ b/client/src/main/java/com/epri/fx/client/gui/uicomponents/main/MainController.java
@@ -32,6 +32,7 @@ import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.geometry.Insets;
 import javafx.scene.Node;
+import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.Label;
 import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
@@ -127,6 +128,7 @@ public class MainController {
 
     @PostConstruct
     public void init() throws FlowException {
+
         userLabel.textProperty().bind(ApplicatonStore.nameProperty());
         roleLabel.textProperty().bind(ApplicatonStore.getRoles().asString());
         userButton.textProperty().bind(ApplicatonStore.nameProperty());
diff --git a/client/src/test/java/TestFx.java b/client/src/test/java/TestFx.java
index f8ba598..9decf89 100644
--- a/client/src/test/java/TestFx.java
+++ b/client/src/test/java/TestFx.java
@@ -10,18 +10,15 @@ import com.epri.fx.client.store.ApplicatonStore;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.svg.SVGGlyph;
 import com.jfoenix.svg.SVGGlyphLoader;
-import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
-import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIconView;
-import de.jensd.fx.glyphs.materialicons.MaterialIcon;
-import de.jensd.fx.glyphs.materialicons.MaterialIconView;
-import javafx.animation.*;
+import javafx.animation.Interpolator;
+import javafx.animation.RotateTransition;
+import javafx.animation.SequentialTransition;
 import javafx.application.Application;
 import javafx.geometry.Point3D;
 import javafx.scene.DepthTest;
 import javafx.scene.Scene;
 import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
-import javafx.scene.transform.Rotate;
 import javafx.stage.Stage;
 import javafx.util.Duration;
 
@@ -48,30 +45,26 @@ public class TestFx extends Application {
         button.setPrefHeight(100);
         button.setPrefWidth(200);
         button.setRipplerFill(Color.RED);
-        button.setDepthTest(DepthTest.DISABLE);
-        SVGGlyph materialIconView=  SVGGlyphLoader.getIcoMoonGlyph(ApplicatonStore.ICON_FONT_KEY+".home-outline");
+        SVGGlyph materialIconView = SVGGlyphLoader.getIcoMoonGlyph(ApplicatonStore.ICON_FONT_KEY + ".home-outline");
+//        materialIconView.setDepthTest(DepthTest.DISABLE);
+        materialIconView.setRotationAxis(new Point3D(0, 1, 0));
         materialIconView.setSize(80);
         button.setGraphic(materialIconView);
         StackPane stackPane = new StackPane();
         stackPane.getChildren().add(button);
-        button.setRotationAxis(new Point3D(1, 0, 0));
 
-        RotateTransition transition1=new RotateTransition(Duration.millis(400),button);
+        RotateTransition transition1 = new RotateTransition(Duration.millis(500), materialIconView);
         transition1.setByAngle(180);
-        transition1.setInterpolator(Interpolator.EASE_OUT);
+        transition1.setInterpolator(Interpolator.EASE_BOTH);
         transition1.setOnFinished(event -> {
         });
-        RotateTransition transition2=new RotateTransition(Duration.millis(300),button);
-        transition2.setByAngle(90);
-        transition2.setInterpolator(Interpolator.EASE_BOTH);
-        transition2.setOnFinished(event -> {
-        });
 
-        SequentialTransition sequentialTransition=new SequentialTransition();
-        sequentialTransition.getChildren().addAll(transition1);
 
         button.setOnMouseEntered(event -> {
-            sequentialTransition.play();
+            transition1.play();
+        });
+        button.setOnMouseExited(event -> {
+            transition1.play();
         });
 
         Scene scene = new Scene(stackPane, 1000, 700);
@@ -79,4 +72,8 @@ public class TestFx extends Application {
         primaryStage.setTitle("JavaFX Welcome");
         primaryStage.show();
     }
+
+    public static void main(String[] args) {
+        launch(args);
+    }
 }