Skip to content

Commit

Permalink
Merge pull request #570 from IdelsTak/master
Browse files Browse the repository at this point in the history 
Enhance table-edge drag-and-drop interaction
  • Loading branch information
@torakiki
torakiki authored Jan 3, 2024
2 parents d0d9ce0 + 8880882 commit a56bc2f
Show file tree
Hide file tree
Showing 3 changed files with 205 additions and 76 deletions.
13 changes: 10 additions & 3 deletions pdfsam-themes/src/main/resources/themes/light/theme.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -476,13 +476,20 @@ btn
-fx-min-height: 15.0em;
}


.table-row-cell:drag-hovered-row {
.table-row-cell:drag-hovered-row-top,
.table-row-cell:drag-hovered-row-bottom {
-fx-border-color: -drag-drop-mark-color;
-fx-border-width: 0.11111em 0 0 0;
-fx-border-radius: 0.0;
}

.table-row-cell:drag-hovered-row-top {
-fx-border-width: 0.11111em 0 0 0;
}

.table-row-cell:drag-hovered-row-bottom {
-fx-border-width: 0 0 0.11111em 0;
}

/**
* Selection table toolbar
*/
Expand Down
204 changes: 145 additions & 59 deletions ...-components/src/main/java/org/pdfsam/ui/components/selection/multiple/SelectionTable.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import javafx.collections.ObservableList;
import javafx.css.PseudoClass;
import javafx.geometry.Point2D;
import javafx.scene.Node;
import javafx.scene.Scene;
import javafx.scene.control.ContextMenu;
import javafx.scene.control.Label;
Expand Down Expand Up @@ -87,6 +86,12 @@

import static java.util.Optional.of;
import static java.util.Optional.ofNullable;
import javafx.animation.KeyFrame;
import javafx.animation.Timeline;
import javafx.geometry.Orientation;
import javafx.scene.control.ScrollBar;
import javafx.scene.layout.Region;
import javafx.util.Duration;
import static org.apache.commons.lang3.StringUtils.defaultString;
import static org.pdfsam.core.context.ApplicationContext.app;
import static org.pdfsam.core.support.EncryptionUtils.encrypt;
Expand All @@ -104,7 +109,10 @@
public class SelectionTable extends TableView<SelectionTableRowData> implements ToolBound, RestorableView {

private static final Logger LOG = LoggerFactory.getLogger(SelectionTable.class);
private static final PseudoClass DRAG_HOVERED_ROW_PSEUDO_CLASS = PseudoClass.getPseudoClass("drag-hovered-row");
private static final PseudoClass DRAG_HOVERED_TOP_ROW_PSEUDO_CLASS = PseudoClass
.getPseudoClass("drag-hovered-row-top");
private static final PseudoClass DRAG_HOVERED_BOTTOM_ROW_PSEUDO_CLASS = PseudoClass
.getPseudoClass("drag-hovered-row-bottom");
private static final DataFormat DND_TABLE_SELECTION_MIME_TYPE = new DataFormat(
"application/x-java-table-selection-list");

Expand All @@ -114,6 +122,9 @@ public class SelectionTable extends TableView<SelectionTableRowData> implements
private final IntegerProperty hoverIndex = new SimpleIntegerProperty(-1);
private Consumer<SelectionChangedEvent> selectionChangedConsumer;

private final Timeline scrollTimeline = new Timeline();
private double scrollDirection = 0;

public SelectionTable(String toolBinding, boolean canDuplicateItems, boolean canMove,
TableColumnProvider<?>... columns) {
this.toolBinding = defaultString(toolBinding);
Expand Down Expand Up @@ -169,8 +180,8 @@ private void initTopSectionContextMenu(ContextMenu contextMenu, boolean hasRange
new SetPageRangesRequest(getSelectionModel().getSelectedItem().pageSelection.get()),
toolBinding()));
setPageRangesItem.setAccelerator(new KeyCodeCombination(KeyCode.R, KeyCombination.CONTROL_DOWN));
selectionChangedConsumer = selectionChangedConsumer.andThen(
e -> setPageRangesItem.setDisable(!e.isSingleSelection()));
selectionChangedConsumer = selectionChangedConsumer
.andThen(e -> setPageRangesItem.setDisable(!e.isSingleSelection()));
contextMenu.getItems().add(setPageRangesItem);
}
contextMenu.getItems().add(new SeparatorMenuItem());
Expand All @@ -182,23 +193,23 @@ private void initItemsSectionContextMenu(ContextMenu contextMenu, boolean canDup
removeSelected.setOnAction(e -> eventStudio().broadcast(new RemoveSelectedEvent(), toolBinding()));
removeSelected.setAccelerator(new KeyCodeCombination(KeyCode.DELETE));
contextMenu.getItems().add(removeSelected);
selectionChangedConsumer = selectionChangedConsumer.andThen(
e -> removeSelected.setDisable(e.isClearSelection()));
selectionChangedConsumer = selectionChangedConsumer
.andThen(e -> removeSelected.setDisable(e.isClearSelection()));
if (canMove) {
MenuItem moveTopSelected = createMenuItem(i18n().tr("Move to Top"), UniconsLine.ANGLE_DOUBLE_UP);
moveTopSelected.setOnAction(
e -> eventStudio().broadcast(new MoveSelectedEvent(MoveType.TOP), toolBinding()));
moveTopSelected
.setOnAction(e -> eventStudio().broadcast(new MoveSelectedEvent(MoveType.TOP), toolBinding()));

MenuItem moveUpSelected = createMenuItem(i18n().tr("Move Up"), UniconsLine.ANGLE_UP);
moveUpSelected.setOnAction(e -> eventStudio().broadcast(new MoveSelectedEvent(MoveType.UP), toolBinding()));

MenuItem moveDownSelected = createMenuItem(i18n().tr("Move Down"), UniconsLine.ANGLE_DOWN);
moveDownSelected.setOnAction(
e -> eventStudio().broadcast(new MoveSelectedEvent(MoveType.DOWN), toolBinding()));
moveDownSelected
.setOnAction(e -> eventStudio().broadcast(new MoveSelectedEvent(MoveType.DOWN), toolBinding()));

MenuItem moveBottomSelected = createMenuItem(i18n().tr("Move to Bottom"), UniconsLine.ANGLE_DOUBLE_DOWN);
moveBottomSelected.setOnAction(
e -> eventStudio().broadcast(new MoveSelectedEvent(MoveType.BOTTOM), toolBinding()));
moveBottomSelected
.setOnAction(e -> eventStudio().broadcast(new MoveSelectedEvent(MoveType.BOTTOM), toolBinding()));

contextMenu.getItems().addAll(moveTopSelected, moveUpSelected, moveDownSelected, moveBottomSelected);

Expand All @@ -221,8 +232,8 @@ private void initItemsSectionContextMenu(ContextMenu contextMenu, boolean canDup

contextMenu.getItems().add(duplicateItem);

selectionChangedConsumer = selectionChangedConsumer.andThen(
e -> duplicateItem.setDisable(e.isClearSelection()));
selectionChangedConsumer = selectionChangedConsumer
.andThen(e -> duplicateItem.setDisable(e.isClearSelection()));
}
}

Expand All @@ -238,8 +249,8 @@ private void initBottomSectionContextMenu(ContextMenu contextMenu) {
}));

MenuItem openFileItem = createMenuItem(i18n().tr("Open"), UniconsLine.FILE_ALT);
openFileItem.setOnAction(e -> eventStudio().broadcast(
new NativeOpenFileRequest(getSelectionModel().getSelectedItem().descriptor().getFile())));
openFileItem.setOnAction(e -> eventStudio()
.broadcast(new NativeOpenFileRequest(getSelectionModel().getSelectedItem().descriptor().getFile())));

MenuItem openFolderItem = createMenuItem(i18n().tr("Open Folder"), UniconsLine.FOLDER);
openFolderItem.setOnAction(e -> eventStudio().broadcast(new NativeOpenFileRequest(
Expand All @@ -263,30 +274,20 @@ private void initBottomSectionContextMenu(ContextMenu contextMenu) {

private MenuItem createMenuItem(String text, Ikon icon) {
var item = new MenuItem(text);
//TODO set font size 1.1 em
// TODO set font size 1.1 em
item.setGraphic(FontIcon.of(icon));
item.setDisable(true);
return item;
}

private void initDragAndDrop(boolean canMove) {
scrollTimeline.setCycleCount(Timeline.INDEFINITE);
scrollTimeline.getKeyFrames().add(new KeyFrame(Duration.millis(20), "Scroll", event -> dragScroll()));

hoverIndex.addListener((observable, oldIndex, newIndex) -> {
List<Node> cells = new ArrayList<>(lookupAll(".table-row-cell"));
int newIndexValue = newIndex.intValue();

if (newIndexValue == -1) {
cells.forEach(cell -> cell.pseudoClassStateChanged(DRAG_HOVERED_ROW_PSEUDO_CLASS, false));
return;
}

for (int i = 0; i < cells.size(); i++) {
TableRow<?> row = (TableRow<?>) cells.get(i);
boolean hovered = i == newIndexValue;

row.pseudoClassStateChanged(DRAG_HOVERED_ROW_PSEUDO_CLASS, hovered);
}
});
addEventFilter(DragEvent.DRAG_OVER, this::autoscrollIfNeeded);
addEventFilter(DragEvent.DRAG_EXITED, this::stopAutoScrollIfNeeded);
addEventFilter(DragEvent.DRAG_DROPPED, this::stopAutoScrollIfNeeded);
addEventFilter(DragEvent.DRAG_DONE, this::stopAutoScrollIfNeeded);

setOnDragOver(e -> dragConsume(e, this.onDragOverConsumer()));
setOnDragEntered(e -> dragConsume(e, this.onDragEnteredConsumer()));
Expand All @@ -309,32 +310,51 @@ private void initDragAndDrop(boolean canMove) {
});

row.setOnDragOver(e -> {
var rowIndex = row.getIndex();
var affectedRowIndex = (e.getY() > (row.getHeight() / 2)) ? (rowIndex + 1) : rowIndex;

hoverIndex.set(affectedRowIndex);

if (!row.isEmpty()) {
if (affectedRowIndex > rowIndex) {
activateHoverBottomPsuedoClass(row);
} else {
activateHoverTopPseudoClass(row);
}
} else {
clearHoverPseudoClasses(row);
}

if (e.getGestureSource() != row && e.getDragboard().hasContent(DND_TABLE_SELECTION_MIME_TYPE)) {
if (!((List<Integer>) e.getDragboard().getContent(DND_TABLE_SELECTION_MIME_TYPE)).contains(
row.getIndex())) {
if (!((List<Integer>) e.getDragboard().getContent(DND_TABLE_SELECTION_MIME_TYPE))
.contains(rowIndex)) {
e.acceptTransferModes(TransferMode.MOVE);
e.consume();
}
}
});
row.setOnDragEntered(e -> {
if (!row.isEmpty() && e.getDragboard().hasContent(DND_TABLE_SELECTION_MIME_TYPE)) {
if (!((List<Integer>) e.getDragboard().getContent(DND_TABLE_SELECTION_MIME_TYPE)).contains(
row.getIndex())) {
if (!((List<Integer>) e.getDragboard().getContent(DND_TABLE_SELECTION_MIME_TYPE))
.contains(row.getIndex())) {
row.setOpacity(0.6);
}
}
});
row.setOnDragExited(e -> {
clearHoverPseudoClasses(row);

if (!row.isEmpty() && e.getDragboard().hasContent(DND_TABLE_SELECTION_MIME_TYPE)) {
if (!((List<Integer>) e.getDragboard().getContent(DND_TABLE_SELECTION_MIME_TYPE)).contains(
row.getIndex())) {
if (!((List<Integer>) e.getDragboard().getContent(DND_TABLE_SELECTION_MIME_TYPE))
.contains(row.getIndex())) {
row.setOpacity(1);
}
}
});

row.setOnDragDropped(e -> {
clearHoverPseudoClasses(row);

Dragboard db = e.getDragboard();
if (db.hasContent(DND_TABLE_SELECTION_MIME_TYPE)) {
Optional<SelectionTableRowData> focus = ofNullable(getFocusModel().getFocusedItem());
Expand Down Expand Up @@ -373,6 +393,21 @@ private void initDragAndDrop(boolean canMove) {
}
}

private static <T> void activateHoverTopPseudoClass(TableRow<T> row) {
row.pseudoClassStateChanged(DRAG_HOVERED_TOP_ROW_PSEUDO_CLASS, true);
row.pseudoClassStateChanged(DRAG_HOVERED_BOTTOM_ROW_PSEUDO_CLASS, false);
}

private static <T> void activateHoverBottomPsuedoClass(TableRow<T> row) {
row.pseudoClassStateChanged(DRAG_HOVERED_TOP_ROW_PSEUDO_CLASS, false);
row.pseudoClassStateChanged(DRAG_HOVERED_BOTTOM_ROW_PSEUDO_CLASS, true);
}

private static <T> void clearHoverPseudoClasses(TableRow<T> row) {
row.pseudoClassStateChanged(DRAG_HOVERED_TOP_ROW_PSEUDO_CLASS, false);
row.pseudoClassStateChanged(DRAG_HOVERED_BOTTOM_ROW_PSEUDO_CLASS, false);
}

private void dragConsume(DragEvent e, Consumer<DragEvent> c) {
if (e.getDragboard().hasFiles()) {
c.accept(e);
Expand All @@ -382,7 +417,6 @@ private void dragConsume(DragEvent e, Consumer<DragEvent> c) {

private Consumer<DragEvent> onDragOverConsumer() {
return (DragEvent e) -> {
hoverIndex.set(calculateHoverIndex(e));
e.acceptTransferModes(TransferMode.COPY_OR_MOVE);
};
}
Expand All @@ -393,7 +427,6 @@ private Consumer<DragEvent> onDragEnteredConsumer() {
}

private void onDragExited(DragEvent e) {
clearDragHover();
placeHolder.setDisable(true);
e.consume();
}
Expand Down Expand Up @@ -422,7 +455,6 @@ public void onLoadDocumentsRequest(PdfLoadRequest loadEvent) {
getSortOrder().clear();
getItems().addAll(dropIndex, toDrop);
focus.map(getItems()::indexOf).ifPresent(getFocusModel()::focus);
clearDragHover();
this.sort();

loadEvent.getDocuments().stream().findFirst().ifPresent(
Expand Down Expand Up @@ -491,9 +523,10 @@ public void showPasswordFieldPopup(ShowPasswordFieldPopupRequest request) {

private void copySelectedToClipboard() {
ClipboardContent content = new ClipboardContent();
writeContent(getSelectionModel().getSelectedItems().stream()
.map(item -> item.descriptor().getFile().getAbsolutePath() + ", " + item.descriptor().getFile().length()
+ ", " + item.descriptor().pages().getValue()).collect(Collectors.toList())).to(content);
writeContent(getSelectionModel()
.getSelectedItems().stream().map(item -> item.descriptor().getFile().getAbsolutePath() + ", "
+ item.descriptor().getFile().length() + ", " + item.descriptor().pages().getValue())
.collect(Collectors.toList())).to(content);
Clipboard.getSystemClipboard().setContent(content);
}

Expand Down Expand Up @@ -540,27 +573,80 @@ public void restoreStateFrom(Map<String, String> data) {

}

private int calculateHoverIndex(DragEvent event) {
var mouseY = event.getY();
var totalHeight = 0.0;
var cells = new ArrayList<>(lookupAll(".table-row-cell"));
public IntegerProperty getHoverIndex() {
return hoverIndex;
}

private void dragScroll() {
var scrollBar = getVerticalScrollbar();

for (var i = 0; i < cells.size(); i++) {
var row = (TableRow<?>) cells.get(i);
if (scrollBar != null) {
var newValue = scrollBar.getValue() + scrollDirection;

if (row != null) {
totalHeight += row.getHeight();
newValue = Math.min(newValue, 1.0);
newValue = Math.max(newValue, 0.0);

if (mouseY <= totalHeight) {
return i - 1;
scrollBar.setValue(newValue);
}
}

private ScrollBar getVerticalScrollbar() {
ScrollBar verticalScrollBar = null;

for (var node : lookupAll(".scroll-bar")) {
if (node instanceof ScrollBar bar) {
if (bar.getOrientation().equals(Orientation.VERTICAL)) {
verticalScrollBar = bar;
}
}
}

return -1;
return verticalScrollBar;
}

private void clearDragHover() {
hoverIndex.setValue(-1);

private void autoscrollIfNeeded(DragEvent evt) {
var hotRegion = (Region) lookup(".clipped-container");

if (hotRegion.getBoundsInLocal().getWidth() < 1) {
hotRegion = this;
if (hotRegion.getBoundsInLocal().getWidth() < 1) {
stopAutoScrollIfNeeded(evt);
return;
}
}

var yOffset = 0.0;
var delta = evt.getSceneY() - hotRegion.localToScene(0, 0).getY();
var proximity = 50.0;

if (delta < proximity) {
yOffset = -(proximity - delta);
}

delta = hotRegion.localToScene(0, 0).getY() + hotRegion.getHeight() - evt.getSceneY();

if (delta < proximity) {
yOffset = proximity - delta;
}

if (yOffset != 0) {
autoscroll(yOffset);
} else {
stopAutoScrollIfNeeded(evt);
}
}

private void stopAutoScrollIfNeeded(DragEvent evt) {
scrollTimeline.stop();
}

private void autoscroll(double yOffset) {
if (yOffset > 0) {
scrollDirection = 1.0 / getItems().size();
} else {
scrollDirection = -1.0 / getItems().size();
}
scrollTimeline.play();
}

}
Loading

0 comments on commit a56bc2f

Please sign in to comment.