Skip to content

fix groups drag and drop #4439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 31, 2018
Merged

fix groups drag and drop #4439

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac101f5
fix groups drag and drop
Oct 31, 2018
59a325f
fix comment
Oct 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 23 additions & 19 deletions src/main/java/org/jabref/gui/groups/GroupTreeView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,20 +195,21 @@ public void initialize() {

// Drag and drop support
row.setOnDragDetected(event -> {
TreeItem<GroupNodeViewModel> selectedItem = treeTable.getSelectionModel().getSelectedItem();
if ((selectedItem != null) && (selectedItem.getValue() != null)) {
Dragboard dragboard = treeTable.startDragAndDrop(TransferMode.MOVE);

// Display the group when dragging
dragboard.setDragView(row.snapshot(null, null));

// Put the group node as content
ClipboardContent content = new ClipboardContent();
content.put(DragAndDropDataFormats.GROUP, selectedItem.getValue().getPath());
dragboard.setContent(content);

event.consume();
List<String> groupsToMove = new ArrayList<>();
for (TreeItem<GroupNodeViewModel> selectedItem : treeTable.getSelectionModel().getSelectedItems()) {
if ((selectedItem != null) && (selectedItem.getValue() != null)) {
groupsToMove.add(selectedItem.getValue().getPath());
}
}

// Put the group nodes as content
Dragboard dragboard = treeTable.startDragAndDrop(TransferMode.MOVE);
// Display the group when dragging
dragboard.setDragView(row.snapshot(null, null));
ClipboardContent content = new ClipboardContent();
content.put(DragAndDropDataFormats.GROUP, groupsToMove);
dragboard.setContent(content);
event.consume();
});
row.setOnDragOver(event -> {
Dragboard dragboard = event.getDragboard();
Expand Down Expand Up @@ -240,13 +241,16 @@ public void initialize() {
row.setOnDragDropped(event -> {
Dragboard dragboard = event.getDragboard();
boolean success = false;

if (dragboard.hasContent(DragAndDropDataFormats.GROUP)) {
String pathToSource = (String) dragboard.getContent(DragAndDropDataFormats.GROUP);
Optional<GroupNodeViewModel> source = viewModel.rootGroupProperty().get()
.getChildByPath(pathToSource);
if (source.isPresent()) {
source.get().draggedOn(row.getItem(), getDroppingMouseLocation(row, event));
success = true;
List<String> pathToSources = (List<String>) dragboard.getContent(DragAndDropDataFormats.GROUP);
for (String pathToSource : pathToSources) {
Optional<GroupNodeViewModel> source = viewModel.rootGroupProperty().get()
.getChildByPath(pathToSource);
if (source.isPresent()) {
source.get().draggedOn(row.getItem(), getDroppingMouseLocation(row, event));
success = true;
}
}
}

Expand Down