Skip to content

Commit ebe2617

Browse files
committed
Fix drag and drop
1 parent d7f39c6 commit ebe2617

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

src/main/java/com/lukeonuke/lmark/ApplicationConstants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ public class ApplicationConstants {
1616
public static final String MARKDOWN_CACHE_PATH = "markdown-renderer-cache";
1717
public static final Font FONTS_AWESOME = Font.loadFont(LMark.class.getResourceAsStream("/gui/fa-6-solid.otf"), 12);
1818
public static final String TMP = "tmp/";
19-
public static final String APPDIR = LMark.class.getName();
19+
public static final String APPDIR = ".lmark";
2020
}

src/main/java/com/lukeonuke/lmark/gui/StartWindow.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import javafx.scene.control.ListView;
1717
import javafx.scene.image.Image;
1818
import javafx.scene.input.Dragboard;
19+
import javafx.scene.input.TransferMode;
1920
import javafx.scene.layout.AnchorPane;
2021
import javafx.stage.FileChooser;
2122
import javafx.stage.Stage;
@@ -82,12 +83,19 @@ public void show() {
8283
});
8384

8485
root.setOnDragOver(dragEvent -> {
86+
if (dragEvent.getDragboard().hasFiles()) dragEvent.acceptTransferModes(TransferMode.ANY);
87+
});
88+
89+
root.setOnDragDropped(dragEvent -> {
8590
Dragboard db = dragEvent.getDragboard();
91+
if(!db.hasFiles()) return;
8692
File file = db.getFiles().get(0);
8793

8894
try {
8995
FileUtils.getInstance(file.getPath());
9096
hide();
97+
dragEvent.setDropCompleted(true);
98+
dragEvent.consume();
9199

92100
FileUtils.addToRecents(file);
93101

src/main/java/com/lukeonuke/lmark/util/OSIntegration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public static File getAppData(){
143143
if(OS.equals(OperatingSystem.MACOS)){
144144
return new File(File.separator + "Library" +
145145
File.separator + "Application Support" +
146-
File.separator + ApplicationConstants.APPDIR + File.separator);
146+
File.separator + LMark.class.getName() + File.separator);
147147
}
148148
return new File(System.getProperty("user.home") +
149149
File.separator + ApplicationConstants.APPDIR + File.separator);

0 commit comments

Comments
 (0)