mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-25 17:00:36 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GT-3219_adamopolous_drag-n-drop-off-target' into Ghidra_9.1
(fixes #1093)
This commit is contained in:
Ryan Kurtz
2019-10-15 12:15:56 -04:00
parent e77bc02f1c 4adece79a2
commit 56cc4d9f68
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/support/GTreeRenderer.java
View File

@@ -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();