ui layout

leewyatt · Dec 30, 2022 · 063a2fa · 063a2fa
1 parent 8ef313a
commit 063a2fa
Show file tree

Hide file tree

Showing 22 changed files with 263 additions and 59 deletions.
diff --git a/pom.xml b/pom.xml
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>com.github.leewyatt</groupId>
             <artifactId>rxcontrols</artifactId>
-            <version>11.0.2</version>
+            <version>11.0.3</version>
         </dependency>
         <dependency>
             <groupId>org.controlsfx</groupId>

diff --git a/src/main/java/com/leewyatt/fxtools/FXToolsApp.java b/src/main/java/com/leewyatt/fxtools/FXToolsApp.java
@@ -15,6 +15,7 @@
 import javafx.application.Platform;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
+import javafx.scene.PerspectiveCamera;
 import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
 import javafx.stage.Stage;
@@ -56,6 +57,7 @@ public void start(Stage primaryStage) throws Exception {
         scene.getStylesheets().add(ResourcesUtil.cssExternalForm("main-stage-" + skinStyle + ".css"));
         loadMainPane();
         scene.setFill(Color.TRANSPARENT);
+        scene.setCamera(new PerspectiveCamera());
         primaryStage.initStyle(StageStyle.TRANSPARENT);
         primaryStage.setScene(scene);
         primaryStage.setTitle("FXTools");

diff --git a/src/main/java/com/leewyatt/fxtools/ui/alert/DonateAlertController.java b/src/main/java/com/leewyatt/fxtools/ui/alert/DonateAlertController.java
@@ -0,0 +1,17 @@
+package com.leewyatt.fxtools.ui.alert;
+
+
+import com.leewyatt.fxtools.utils.OSUtil;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+/**
+ * @author LeeWyatt
+ */
+public class DonateAlertController {
+
+    @FXML
+    void onClickDonorListBtn(ActionEvent event) {
+        OSUtil.showDoc("https://gitee.com/leewyatt/FXTools#%E6%89%93%E8%B5%8F%E5%88%97%E8%A1%A8");
+    }
+
+}
diff --git a/src/main/java/com/leewyatt/fxtools/ui/cells/ImageListCell.java b/src/main/java/com/leewyatt/fxtools/ui/cells/ImageListCell.java
@@ -1,7 +1,5 @@
 package com.leewyatt.fxtools.ui.cells;
 
-import com.google.common.eventbus.Subscribe;
-import com.leewyatt.fxtools.event.SkinChangedEvent;
 import com.leewyatt.fxtools.model.ImageInfo;
 import com.leewyatt.fxtools.ui.alert.ConfirmationAlert;
 import com.leewyatt.fxtools.utils.ImageUtil;
@@ -61,7 +59,7 @@ public ImageListCell() {
             }
             if (event.isControlDown()) {
                 OSUtil.openAndSelectedFile(getItem().getPath());
-            }else {
+            } else {
                 OSUtil.showDoc(getItem().getPath());
             }
             event.consume();
@@ -129,39 +127,39 @@ public String toString(ImageInfo object) {
                 ImageInfo item = getItem();
                 String name = "";
                 if (item != null) {
-                    name=item.getName();
+                    name = item.getName();
                 }
                 return name;
             }
 
             @Override
             public ImageInfo fromString(String string) {
                 ImageInfo item = getItem();
-                Optional<ImageInfo> first = getListView().getItems().stream().filter(temp -> temp!=item && temp.getName().equals(string)).findFirst();
+                Optional<ImageInfo> first = getListView().getItems().stream().filter(temp -> temp != item && temp.getName().equals(string)).findFirst();
                 if (first.isPresent()) {
                     boolean b = new ConfirmationAlert("已存在同名图片.确定要修改吗").showAndGetResult();
                     if (b) {
                         if (item != null) {
                             item.setName(string);
                         }
                     }
-                }else {
+                } else {
                     if (item != null) {
                         item.setName(string);
                     }
                 }
                 return item;
             }
         });
-        MenuItem deleteBtn = new MenuItem(message("listCell.menu.delete"),getRegion("delete-region"));
+        MenuItem deleteBtn = new MenuItem(message("listCell.menu.delete"), getRegion("delete-region"));
         deleteBtn.setOnAction(event -> {
             getListView().getItems().remove(getItem());
         });
-        MenuItem editBtn = new MenuItem(message("listCell.menu.edit"),getRegion("edit-region"));
+        MenuItem editBtn = new MenuItem(message("listCell.menu.edit"), getRegion("edit-region"));
         editBtn.setOnAction(event -> {
             startEdit();
         });
-        setContextMenu(new ContextMenu(editBtn,deleteBtn));
+        setContextMenu(new ContextMenu(editBtn, deleteBtn));
     }
 
     private Region getRegion(String styleClass) {
@@ -210,8 +208,4 @@ public void updateItem(ImageInfo item, boolean empty) {
         }
     }
 
-    @Subscribe
-    public void skinChangedHandler(SkinChangedEvent event) {
-       updateItem(getItem(), isEmpty());
-    }
 }
diff --git a/src/main/java/com/leewyatt/fxtools/uicontroller/ImageCutterPageController.java b/src/main/java/com/leewyatt/fxtools/uicontroller/ImageCutterPageController.java
@@ -8,14 +8,14 @@
 import com.leewyatt.fxtools.ui.alert.InformationAlert;
 import com.leewyatt.fxtools.ui.cells.ImageListCell;
 import com.leewyatt.fxtools.utils.ToolSettingsUtil;
+import com.leewyatt.rxcontrols.pane.RXCarouselPane;
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.SelectionMode;
 import javafx.scene.control.ToggleGroup;
-import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.StackPane;
 
@@ -64,6 +64,8 @@ public class ImageCutterPageController extends ImageTaskController {
     @FXML
     private ToggleGroup sourceImageGroup;
 
+
+
     public ImageCutterPageController() {
         importEventType = ImageEventType.CUTTER_IMPORT;
         exportEventType = ImageEventType.CUTTER_EXPORT;

diff --git a/src/main/java/com/leewyatt/fxtools/uicontroller/ImageFormatPageController.java b/src/main/java/com/leewyatt/fxtools/uicontroller/ImageFormatPageController.java
@@ -10,7 +10,6 @@
 import com.leewyatt.fxtools.ui.paintpicker.DoubleTextField;
 import com.leewyatt.fxtools.utils.ImageUtil;
 import com.leewyatt.fxtools.utils.ToolSettingsUtil;
-import com.leewyatt.rxcontrols.pane.RXCarouselPane;
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
@@ -31,7 +30,7 @@
 /**
  * @author LeeWyatt
  */
-public class ImageFormatPageController extends ImageTaskController{
+public class ImageFormatPageController extends ImageTaskController {
 
     @FXML
     private ResourceBundle resources;
@@ -51,13 +50,8 @@ public class ImageFormatPageController extends ImageTaskController{
     @FXML
     private Pane centerPane;
 
-    @FXML
-    private RXCarouselPane formatPage;
-
     private DoubleTextField scaleField;
 
-
-
     public ImageFormatPageController() {
         EventBusUtil.getDefault().register(this);
         importEventType = ImageEventType.FORMAT_IMPORT;
@@ -87,7 +81,7 @@ void initialize() {
         imageListView.setOnDragOver(this::onDragOverImage);
         imageListView.setEditable(true);
 
-        convertComboBox.getItems().addAll(ImageUtil.FORMAT_PNG, ImageUtil.FORMAT_JPG, ImageUtil.FORMAT_GIF,ImageUtil.FORMAT_BMP, ImageUtil.FORMAT_ICO);
+        convertComboBox.getItems().addAll(ImageUtil.FORMAT_PNG, ImageUtil.FORMAT_JPG, ImageUtil.FORMAT_GIF, ImageUtil.FORMAT_BMP, ImageUtil.FORMAT_ICO);
         convertComboBox.getSelectionModel().select(0);
         convertComboBox.getSelectionModel().selectedItemProperty().addListener((ob, ov, nv) ->
                 qualityComboBox.setDisable(!ImageUtil.FORMAT_JPG.equals(nv))
@@ -96,7 +90,6 @@ void initialize() {
         qualityComboBox.getSelectionModel().select(0);
     }
 
-
     @FXML
     void onConvertImageFormatAction(ActionEvent event) throws IOException {
         ObservableList<ImageInfo> items = imageListView.getItems();

diff --git a/src/main/java/com/leewyatt/fxtools/uicontroller/ImagePageController.java b/src/main/java/com/leewyatt/fxtools/uicontroller/ImagePageController.java
@@ -56,4 +56,5 @@ public void pageJumpHandler(PageJumpEvent pageJumpEvent) {
     }
 
 
+
 }
diff --git a/src/main/java/com/leewyatt/fxtools/uicontroller/ImageTaskController.java b/src/main/java/com/leewyatt/fxtools/uicontroller/ImageTaskController.java
@@ -11,8 +11,9 @@
 import com.leewyatt.fxtools.ui.paintpicker.IntegerTextField;
 import com.leewyatt.fxtools.utils.AlphanumComparator;
 import com.leewyatt.fxtools.utils.ImageUtil;
-import com.leewyatt.fxtools.utils.ToolSettingsUtil;
 import com.leewyatt.fxtools.utils.OSUtil;
+import com.leewyatt.fxtools.utils.ToolSettingsUtil;
+import com.leewyatt.rxcontrols.pane.RXCarouselPane;
 import javafx.application.Platform;
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
@@ -58,6 +59,9 @@ public class ImageTaskController {
     @FXML
     protected MaskerPane maskerPane;
 
+    @FXML
+    private RXCarouselPane carouselPane;
+
     protected IntegerTextField colNumField;
 
     protected String[] supportedExtensions;
@@ -151,14 +155,17 @@ protected File chooseExportDir(int size) {
     protected void onDragDroppedImage(DragEvent event) {
         Dragboard db = event.getDragboard();
         boolean success = false;
+        List<File> result = null;
         if (db.hasFiles()) {
             List<File> files = event.getDragboard().getFiles();
-            files = files.stream().filter(this::isImageCompliantFormat).collect(Collectors.toList());
-            startLoadImageService(files);
+            result = files.stream().filter(this::isImageCompliantFormat).collect(Collectors.toList());
             success = true;
         }
         event.setDropCompleted(success);
         event.consume();
+        if (result != null) {
+            startLoadImageService(result);
+        }
     }
 
     /**

diff --git a/src/main/java/com/leewyatt/fxtools/uicontroller/MainPaneController.java b/src/main/java/com/leewyatt/fxtools/uicontroller/MainPaneController.java
@@ -149,6 +149,12 @@ void initialize() throws IOException {
             }
             carousel.setSelectedIndex(menuGroup.getToggles().indexOf(nv));
         });
+        if (OSUtil.getOS() != OSUtil.OS.WINDOWS) {
+            snapshotBtn.setManaged(false);
+            colorPickerBtn.setManaged(false);
+            snapshotBtn.setVisible(false);
+            colorPickerBtn.setVisible(false);
+        }
     }
 
     @FXML
@@ -226,8 +232,6 @@ void onClickIvBtn(ActionEvent event) {
             contentPane.setClip(null);
             toggleBtn.setRotate(0);
             toggleBtn.setDisable(false);
-            carousel.getSubScene().getRoot().applyCss();
-            carousel.getSubScene().getRoot().requestLayout();
         });
         tl.play();
 

diff --git a/src/main/java/com/leewyatt/fxtools/uicontroller/SvgPageController.java b/src/main/java/com/leewyatt/fxtools/uicontroller/SvgPageController.java
@@ -167,6 +167,8 @@ private void initSvgPreviewPane() {
         svgRegion.setStyle(DEFAULT_BLACK_GROUND);
         svgRegion.setShape(svgPath);
         svgPreviewPane.getChildren().add(svgRegion);
+        svgPreviewPane.setOnDragDropped(this::onDragDroppedSvg);
+        svgPreviewPane.setOnDragOver(this::onDragOverSvg);
         svgPreviewPane.setOnScroll(event -> {
             if (!verifiedPath()) {
                 return;
@@ -184,17 +186,16 @@ private void initSvgPreviewPane() {
         regionContextMenu = createRegionContextMenu();
         svgPreviewPane.setOnMousePressed(event -> {
             if (event.getButton() == MouseButton.PRIMARY) {
+                if (regionContextMenu.isShowing()) {
+                    regionContextMenu.hide();
+                }
                 if (event.isControlDown() && lastFilePath != null) {
                     openAndSelectedFile(lastFilePath);
-                    event.consume();
-                    return;
                 }
-                openSvgFile();
-                event.consume();
-            }
-            if (event.getButton() == MouseButton.SECONDARY) {
+            } else if (event.getButton() == MouseButton.SECONDARY) {
                 regionContextMenu.show(svgPreviewPane, event.getScreenX(), event.getScreenY());
             }
+            event.consume();
         });
     }
 
@@ -208,18 +209,16 @@ private void initImagePreviewPane() {
         webViewContextMenu = createWebViewContextMenu();
         imagePreviewPane.setOnMousePressed(event -> {
             if (event.getButton() == MouseButton.PRIMARY) {
+                if (webViewContextMenu.isShowing()) {
+                    webViewContextMenu.hide();
+                }
                 if (event.isControlDown() && lastFilePath != null) {
                     openAndSelectedFile(lastFilePath);
-                    event.consume();
-                    return;
                 }
-                openSvgFile();
-                event.consume();
-            }
-            if (event.getButton() == MouseButton.SECONDARY) {
+            } else if (event.getButton() == MouseButton.SECONDARY) {
                 webViewContextMenu.show(imagePreviewPane, event.getScreenX(), event.getScreenY());
             }
-
+            event.consume();
         });
     }
 
@@ -334,18 +333,22 @@ private void initCodeComboBox(PaintPicker paintPicker) {
     private void onDragDroppedSvg(DragEvent event) {
         Dragboard db = event.getDragboard();
         boolean success = false;
+        File svgFile = null;
         if (db.hasFiles()) {
             List<File> files = event.getDragboard().getFiles();
             for (File file : files) {
                 if (isSvgFile(file)) {
-                    setXMLData(file);
+                    svgFile = file;
+                    success = true;
                     break;
                 }
             }
-            success = true;
         }
         event.setDropCompleted(success);
         event.consume();
+        if (svgFile != null) {
+            setXMLData(svgFile);
+        }
     }
 
     void onDragOverSvg(DragEvent event) {
@@ -398,18 +401,15 @@ private void heightChanged() {
         svgRegion.setMaxSize(newWidth * rate, newHeight * rate);
         reSelectedCodeCombobox();
     }
-
     private void widthChanged() {
         Bounds bounds = svgPath.getLayoutBounds();
-        double regionWidth = svgRegion.getWidth();
-        double regionHeight = svgRegion.getHeight();
-        double scaleX = bounds.getWidth() / regionWidth;
-        double scaleY = bounds.getHeight() / regionHeight;
+        double width = bounds.getWidth();
+        double height = bounds.getHeight();
         double newWidth = widthFiled.getValue();
-        double scale = newWidth / scaleX;
-        double newHeight = scaleY * scale;
+        double scale = newWidth / width;
+        double newHeight= height * scale;
         heightField.setText(newHeight + "");
-        double rate = NumberUtil.computeScaleRate(scaleX, scaleY, 128);
+        double rate = NumberUtil.computeScaleRate(width, height, 128);
         svgRegion.setMaxSize(newWidth * rate, newHeight * rate);
         reSelectedCodeCombobox();
     }

diff --git a/src/main/resources/css/about-alert-dark.css b/src/main/resources/css/about-alert-dark.css
@@ -145,4 +145,19 @@
 }
 .url-label:hover {
     -fx-underline: true;
+}
+.donor-list-btn {
+    -fx-border-color:#75A4EB;
+    -fx-border-radius: 16px;
+    -fx-background-radius: 16px;
+    -fx-background-color: null;
+    -fx-font-size: 16px;
+}
+.donor-list-btn:hover {
+    -fx-background-color: rgba(232, 232, 232, 0.1);;
+}
+
+.donor-list-btn:pressed {
+    -fx-background-color: rgba(255, 255, 255, 0.2);
+    -fx-text-fill:white;
 }