From 8e661d11445b9e4c906b26a556b5f6c7f1998f27 Mon Sep 17 00:00:00 2001 From: cyqa2001 Date: Tue, 10 May 2022 15:41:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=94=B9=E4=BA=86=E5=A4=8D=E5=88=B6?= =?UTF-8?q?=E7=B2=98=E8=B4=B4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/controller/ActionController.java | 26 +++---------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/src/main/java/design/controller/ActionController.java b/src/main/java/design/controller/ActionController.java index 4c46b93..b96503b 100644 --- a/src/main/java/design/controller/ActionController.java +++ b/src/main/java/design/controller/ActionController.java @@ -47,15 +47,11 @@ public class ActionController { if(ImageLabel.getSelectedPictures().size()<=0) { return; } - if(ImageLabel.getCutedPictures().size() > 0) { - for(ImageLabel pNode : ImageLabel.getCutedPictures()) { - pNode.getImageView().setEffect(null); - } - ImageLabel.getCutedPictures().clear(); - } + Clipboard clipboard = Clipboard.getSystemClipboard(); ClipboardContent clipboardContent = new ClipboardContent(); clipboard.clear(); + ImageLabel.getSelectedPictureFiles().clear(); for(ImageLabel pNode : ImageLabel.getSelectedPictures()) { ImageLabel.getSelectedPictureFiles().add(pNode.getImageFile()); } @@ -74,19 +70,7 @@ public class ActionController { if (files.size() <= 0) { return; } - if (ImageLabel.getCutedPictures().size() > 0) { - File first = files.get(0); - if(first.getParentFile().getAbsolutePath().compareTo(imagePreviewController.getOldPath()) == 0){ - for(ImageLabel pNode : ImageLabel.getCutedPictures()) { - pNode.getImageView().setEffect(null); - } - ImageLabel.clearSelected(); - ImageLabel.getCutedPictures().clear(); - ImageLabel.getSelectedPictureFiles().clear(); - clipboard.clear(); - return; - } - } + for(File oldFile : files) { String newName = Pasterename(imagePreviewController.getOldPath(),oldFile.getName()); File newFile = new File(imagePreviewController.getOldPath()+File.separator+newName); @@ -117,9 +101,7 @@ public class ActionController { imagePreviewController.refreshImageViews(newFile); - if(ImageLabel.getCutedPictures().size()>0) { - oldFile.delete(); - } + // imagePreviewViewController.showPicture(); } -- Gitee From a4bff5c1c1d623be6e412ae4aae8f268aa40d117 Mon Sep 17 00:00:00 2001 From: cyqa2001 Date: Tue, 10 May 2022 15:55:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=B9=E4=BA=86=E5=A4=8D=E5=88=B6?= =?UTF-8?q?=E7=B2=98=E8=B4=B4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/controller/ActionController.java | 26 +++---------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/src/main/java/design/controller/ActionController.java b/src/main/java/design/controller/ActionController.java index 52d70a5..cff3c9d 100644 --- a/src/main/java/design/controller/ActionController.java +++ b/src/main/java/design/controller/ActionController.java @@ -47,15 +47,11 @@ public class ActionController { if(ImageLabel.getSelectedPictures().size()<=0) { return; } - if(ImageLabel.getCutedPictures().size() > 0) { - for(ImageLabel pNode : ImageLabel.getCutedPictures()) { - pNode.getImageView().setEffect(null); - } - ImageLabel.getCutedPictures().clear(); - } + Clipboard clipboard = Clipboard.getSystemClipboard(); ClipboardContent clipboardContent = new ClipboardContent(); clipboard.clear(); + ImageLabel.getSelectedPictureFiles().clear(); for(ImageLabel pNode : ImageLabel.getSelectedPictures()) { ImageLabel.getSelectedPictureFiles().add(pNode.getImageFile()); } @@ -74,19 +70,7 @@ public class ActionController { if (files.size() <= 0) { return; } - if (ImageLabel.getCutedPictures().size() > 0) { - File first = files.get(0); - if(first.getParentFile().getAbsolutePath().compareTo(imagePreviewController.getOldPath()) == 0){ - for(ImageLabel pNode : ImageLabel.getCutedPictures()) { - pNode.getImageView().setEffect(null); - } - ImageLabel.clearSelected(); - ImageLabel.getCutedPictures().clear(); - ImageLabel.getSelectedPictureFiles().clear(); - clipboard.clear(); - return; - } - } + for(File oldFile : files) { String newName = Pasterename(imagePreviewController.getOldPath(),oldFile.getName()); File newFile = new File(imagePreviewController.getOldPath()+File.separator+newName); @@ -108,9 +92,7 @@ public class ActionController { imagePreviewController.refreshImageViews(newFile); - if(ImageLabel.getCutedPictures().size()>0) { - oldFile.delete(); - } + } clipboard.clear(); } -- Gitee