BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-07 12:24:58 +10:00
Code Issues Packages Projects Releases Wiki Activity

Clicking on a component type in the left-hand component tree sometimes does not register and does not instantiate the component

Browse Source
This commit is contained in:
Bane Stojkovic
2026-03-26 20:33:16 +01:00
parent 150e03c023
commit af3887b9ac
2 changed files with 59 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-core/src/main/resources/update.xml
+4
View File
@@ -377,6 +377,10 @@
<changeType>BUG_FIX</changeType>
<description>Right click (or two finger tap on mac) after selecting a component with a regular click opens editor dialog in addition to the context menu</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>BUG_FIX</changeType>
<description>Clicking on a component type in the left-hand component tree sometimes does not register and does not instantiate the component</description>
</org.diylc.appframework.update.Change>
</changes>
<url>https://github.com/bancika/diy-layout-creator/releases</url>
</org.diylc.appframework.update.Version>
diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/tree/TreePanel.java
+55 -13
View File
@@ -96,6 +96,13 @@ public class TreePanel extends JPanel {
private JPopupMenu popup;
/**
* When the selection listener already ran the leaf action for this path, the following
* left-button {@code mouseReleased} must not run it again. Cleared after that release or on the
* next EDT tick (keyboard-only selection).
*/
private TreePath suppressLeafActivationForPath;
@SuppressWarnings("unchecked")
public TreePanel(IPlugInPort plugInPort, ISwingUI swingUI) {
this.plugInPort = plugInPort;
@@ -220,7 +227,14 @@ public class TreePanel extends JPanel {
if (node != null && node instanceof TreeNode) {
TreeNode payload = (TreeNode) node;
if (payload.getClickListener() != null) {
final TreePath path = e.getPath();
suppressLeafActivationForPath = path;
payload.getClickListener().mouseClicked(null);
SwingUtilities.invokeLater(() -> {
if (suppressLeafActivationForPath != null && suppressLeafActivationForPath.equals(path)) {
suppressLeafActivationForPath = null;
}
});
}
}
}
@@ -230,21 +244,49 @@ public class TreePanel extends JPanel {
@Override
public void mouseClicked(MouseEvent e) {
if (e.getClickCount() != 1)
if (e.getClickCount() != 1 || !SwingUtilities.isRightMouseButton(e))
return;
if (SwingUtilities.isRightMouseButton(e)) {
int row = tree.getClosestRowForLocation(e.getX(), e.getY());
tree.setSelectionRow(row);
getPopup().show(e.getComponent(), e.getX(), e.getY());
} else {
TreePath path = tree.getClosestPathForLocation(e.getX(), e.getY());
Object node = path.getLastPathComponent();
if (node != null && node instanceof TreeNode) {
TreeNode payload = (TreeNode) node;
if (payload.getClickListener() != null) {
payload.getClickListener().mouseClicked(e);
}
int row = tree.getClosestRowForLocation(e.getX(), e.getY());
tree.setSelectionRow(row);
getPopup().show(e.getComponent(), e.getX(), e.getY());
}
/**
* Prefer release over click: {@code mouseClicked} is not posted if the cursor moves
* between press and release (common with DnD or hand jitter), while selection may still
* change — then re-clicks on the same row fire no selection event.
*/
@Override
public void mouseReleased(MouseEvent e) {
if (SwingUtilities.isRightMouseButton(e) || e.isPopupTrigger()) {
return;
}
if (e.getClickCount() != 1) {
return;
}
TreePath path = tree.getPathForLocation(e.getX(), e.getY());
if (path == null) {
path = tree.getClosestPathForLocation(e.getX(), e.getY());
}
if (path == null) {
return;
}
if (path.equals(suppressLeafActivationForPath)) {
suppressLeafActivationForPath = null;
return;
}
if (!path.equals(tree.getSelectionPath())) {
return;
}
Object node = path.getLastPathComponent();
if (node instanceof TreeNode) {
TreeNode payload = (TreeNode) node;
if (payload.getClickListener() != null) {
payload.getClickListener().mouseClicked(e);
}
}
}