Fixing bug introduced in JabRef#9728 which undid/broke this improveme…

…nt: JabRef#8785. Now, once again, the mouse click is handled and consumed at the capture stage if the expansion pane is licked, therefore preventing the node from being selected.
credmond · Jul 24, 2023 · 9f18d3d · 9f18d3d
1 parent 1332e29
commit 9f18d3d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -79,6 +79,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 
 ### Fixed
 
+- We fixed an issue where click the group expansion pane/arrow caused the node to be selected, when it should just expand/detract the node - We fixed an issue when overwriting the owner was disabled. [#10111](https://github.com/JabRef/jabref/pull/10111)
 - We fixed an issue where the browser import would add ' characters before the BibTeX entry on Linux. [#9588](https://github.com/JabRef/jabref/issues/9588)
 - We fixed an issue where searching for a specific term with the DOAB fetcher lead to an exception. [#9571](https://github.com/JabRef/jabref/issues/9571)
 - We fixed an issue where the "Import" -> "Library to import to" did not show the correct library name if two opened libraries had the same suffix. [#9567](https://github.com/JabRef/jabref/issues/9567)

diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeView.java b/src/main/java/org/jabref/gui/groups/GroupTreeView.java
@@ -230,7 +230,7 @@ private void initialize() {
                             event.consume();
                         }
                     }
-                })
+                }, true)
                 .withCustomInitializer(row -> {
                     // Remove disclosure node since we display custom version in separate column
                     // Simply setting to null is not enough since it would be replaced by the default node on every change

diff --git a/src/main/java/org/jabref/gui/util/ViewModelTreeTableRowFactory.java b/src/main/java/org/jabref/gui/util/ViewModelTreeTableRowFactory.java
@@ -27,6 +27,10 @@
 
 public class ViewModelTreeTableRowFactory<S> implements Callback<TreeTableView<S>, TreeTableRow<S>> {
     private BiConsumer<S, ? super MouseEvent> onMouseClickedEvent;
+
+    // True if listener should be at filter stage, otherwise use default Node method
+    private boolean onMousePressedEventCapturePhase;
+
     private BiConsumer<S, ? super MouseEvent> onMousePressedEvent;
     private Consumer<TreeTableRow<S>> toCustomInitializer;
     private Function<S, ContextMenu> contextMenuFactory;
@@ -44,7 +48,12 @@ public ViewModelTreeTableRowFactory<S> withOnMouseClickedEvent(BiConsumer<S, ? s
     }
 
     public ViewModelTreeTableRowFactory<S> withOnMousePressedEvent(BiConsumer<S, ? super MouseEvent> event) {
+        return withOnMousePressedEvent(event, false);
+    }
+
+    public ViewModelTreeTableRowFactory<S> withOnMousePressedEvent(BiConsumer<S, ? super MouseEvent> event, boolean capturePhase) {
         this.onMousePressedEvent = event;
+        this.onMousePressedEventCapturePhase = capturePhase;
         return this;
     }
 
@@ -165,7 +174,11 @@ protected void updateItem(S row, boolean empty) {
                     }
 
                     if (onMousePressedEvent != null) {
-                        setOnMousePressed(event -> onMousePressedEvent.accept(getItem(), event));
+                        if (onMousePressedEventCapturePhase) {
+                            addEventFilter(MouseEvent.MOUSE_PRESSED, event -> onMousePressedEvent.accept(getItem(), event));
+                        } else {
+                            setOnMousePressed(event -> onMousePressedEvent.accept(getItem(), event));
+                        }
                     }
 
                     if (toCustomInitializer != null) {