Skip to content
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

Jump to bottom

Prevent group expansion arrow from activating group when expanding or collapsing #8785

Merged
merged 10 commits into from
May 22, 2022
Merged

Prevent group expansion arrow from activating group when expanding or collapsing #8785

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4b47dd6
Prevent group expansion arrow from activating group when expanding or…
LIM0000 May 11, 2022
012f42b
Update solution by picking StackPane that has either arrow or tree-no…
LIM0000 May 17, 2022
4531b20
Merge branch 'main' of https://github.com/LIM0000/jabref into fix-for…
LIM0000 May 17, 2022
5d3ab67
Check secondary mousebutton, then only check if is StackPane class
LIM0000 May 17, 2022
04bb61c
Pattern matching to remove unnecessary StackPane cast
LIM0000 May 17, 2022
47fbbff
Update equal() to contains() as object could have multiple styles
LIM0000 May 18, 2022
ac34096
Merge branch 'main' of https://github.com/LIM0000/jabref into fix-for…
LIM0000 May 22, 2022
81f25f8
Update CHANGELOG.md
LIM0000 May 22, 2022
4720baa
Merge branch 'main' of https://github.com/LIM0000/jabref into fix-for…
LIM0000 May 22, 2022
de1f675
Update CHANGELOG.md
LIM0000 May 22, 2022
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
6 changes: 5 additions & 1 deletion 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 @@ -266,7 +266,11 @@ private void initialize() {
.map(this::createContextMenuForGroup)
.orElse((ContextMenu) null));
row.addEventFilter(MouseEvent.MOUSE_PRESSED, event -> {
if (event.getButton() == MouseButton.SECONDARY || event.getTarget() instanceof StackPane) {
if (event.getTarget() instanceof StackPane) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use pattern matching to avoid unnecessary casts

if (event.getTarget() instanceof StackPane pane) {

if (((StackPane) event.getTarget()).getStyleClass().toString().equals("arrow") || ((StackPane) event.getTarget()).getStyleClass().toString().equals("tree-disclosure-node")) {
event.consume();
}
} else if (event.getButton() == MouseButton.SECONDARY) {
// Prevent right-click to select group
event.consume();
}
Expand Down