From 4adece79a2cc7a1dde0ec24a280c965625301074 Mon Sep 17 00:00:00 2001 From: adamopolous Date: Mon, 7 Oct 2019 13:01:57 -0400 Subject: [PATCH] GT-3219: moved drop target assignment before setting background --- .../java/docking/widgets/tree/support/GTreeRenderer.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/support/GTreeRenderer.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/support/GTreeRenderer.java index 60f6fb7318..bff9916023 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/support/GTreeRenderer.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/support/GTreeRenderer.java @@ -48,6 +48,10 @@ public class GTreeRenderer extends DefaultTreeCellRenderer implements GComponent super.getTreeCellRendererComponent(tree, value, selected1, expanded, leaf, row, hasFocus1); + // Important - make sure this happens before the setBackground() call, otherwise we will + // paint the previously dragged-over node as the drop target. + paintDropTarget = (value == dropTarget); + setOpaque(true); setBackground(selected1 ? getBackgroundSelectionColor() : getBackgroundNonSelectionColor()); @@ -71,8 +75,6 @@ public class GTreeRenderer extends DefaultTreeCellRenderer implements GComponent updateIconTextGap(icon, minIconWidth); - paintDropTarget = (value == dropTarget); - GTree gtree = node.getTree(); GTreeFilter filter = gtree == null ? null : gtree.getFilter();