From c018c3bac553e3986678850a038cf8052bca822f Mon Sep 17 00:00:00 2001
From: dragonmacher <48328597+dragonmacher@users.noreply.github.com>
Date: Tue, 9 Apr 2019 09:52:09 -0400
Subject: [PATCH] GT-2735 - Function Graph - show selection color when nodes
 are zoomed out

---
 .../FGVertexPickableBackgroundPaintTransformer.java    | 10 ++++++++++
 .../graph/vertex/AbstractFunctionGraphVertex.java      |  5 +++++
 .../graph/vertex/AbstractGraphComponentPanel.java      |  2 ++
 .../core/functiongraph/graph/vertex/FGVertex.java      |  4 ++++
 .../vertex/GroupedFunctionGraphComponentPanel.java     |  8 ++++++++
 .../graph/vertex/ListingGraphComponentPanel.java       |  5 +++++
 6 files changed, 34 insertions(+)

diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/jung/transformer/FGVertexPickableBackgroundPaintTransformer.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/jung/transformer/FGVertexPickableBackgroundPaintTransformer.java
index e705b3d53f..05717b396b 100644
--- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/jung/transformer/FGVertexPickableBackgroundPaintTransformer.java
+++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/jung/transformer/FGVertexPickableBackgroundPaintTransformer.java
@@ -23,6 +23,7 @@ import com.google.common.base.Function;
 import edu.uci.ics.jung.visualization.picking.PickedInfo;
 import ghidra.app.plugin.core.functiongraph.graph.FGVertexType;
 import ghidra.app.plugin.core.functiongraph.graph.vertex.FGVertex;
+import ghidra.program.util.ProgramSelection;
 
 public class FGVertexPickableBackgroundPaintTransformer implements Function<FGVertex, Paint> {
 
@@ -55,6 +56,15 @@ public class FGVertexPickableBackgroundPaintTransformer implements Function<FGVe
 	@Override
 	public Paint apply(FGVertex v) {
 		Color backgroundColor = v.getBackgroundColor();
+
+		ProgramSelection selection = v.getProgramSelection();
+		if (!selection.isEmpty()) {
+			// mix the colors so the user can see both the selection and the background color
+			Color selectionColor = v.getSelectionColor();
+			Color mixed = mix(selectionColor, backgroundColor);
+			backgroundColor = mixed;
+		}
+
 		FGVertexType vertexType = v.getVertexType();
 		if (info.isPicked(v)) {
 			if (v.isDefaultBackgroundColor()) {
diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/AbstractFunctionGraphVertex.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/AbstractFunctionGraphVertex.java
index 18b386ee6e..ef90736dbc 100644
--- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/AbstractFunctionGraphVertex.java
+++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/AbstractFunctionGraphVertex.java
@@ -289,6 +289,11 @@ public abstract class AbstractFunctionGraphVertex implements FGVertex {
 		return doGetComponent().getBackgroundColor();
 	}
 
+	@Override
+	public Color getSelectionColor() {
+		return doGetComponent().getSelectionColor();
+	}
+
 	@Override
 	public void clearColor() {
 		doGetComponent().clearColor();
diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/AbstractGraphComponentPanel.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/AbstractGraphComponentPanel.java
index 1693fc4dd7..694821e678 100644
--- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/AbstractGraphComponentPanel.java
+++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/AbstractGraphComponentPanel.java
@@ -90,6 +90,8 @@ public abstract class AbstractGraphComponentPanel extends JPanel {
 
 	abstract Color getBackgroundColor();
 
+	abstract Color getSelectionColor();
+
 	abstract Color getUserDefinedColor();
 
 	abstract Color getDefaultBackgroundColor();
diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/FGVertex.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/FGVertex.java
index 47a78ce69c..8dc6ef9bd5 100644
--- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/FGVertex.java
+++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/FGVertex.java
@@ -86,6 +86,8 @@ public interface FGVertex extends VisualVertex {
 
 	public Color getBackgroundColor();
 
+	public Color getSelectionColor();
+
 	public void setBackgroundColor(Color color);
 
 	public void clearColor();
@@ -205,5 +207,7 @@ public interface FGVertex extends VisualVertex {
 	 */
 	public void setShowing(boolean isShowing);
 
+	@Override
 	public void dispose();
+
 }
diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/GroupedFunctionGraphComponentPanel.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/GroupedFunctionGraphComponentPanel.java
index ab87c4ea71..f179bd1969 100644
--- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/GroupedFunctionGraphComponentPanel.java
+++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/GroupedFunctionGraphComponentPanel.java
@@ -39,6 +39,7 @@ import ghidra.util.*;
 import ghidra.util.exception.AssertException;
 import ghidra.util.layout.VerticalLayout;
 import resources.ResourceManager;
+import util.CollectionUtils;
 
 /**
  * This panel looks similar in appearance to the LisGraphComponentPanel, with a header, actions 
@@ -414,6 +415,13 @@ public class GroupedFunctionGraphComponentPanel extends AbstractGraphComponentPa
 		return defaultBackgroundColor;
 	}
 
+	@Override
+	Color getSelectionColor() {
+		Set<FGVertex> vertices = groupVertex.getVertices();
+		FGVertex v = CollectionUtils.any(vertices);
+		return v.getSelectionColor();
+	}
+
 	@Override
 	JComponent getHeader() {
 		return genericHeader;
diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/ListingGraphComponentPanel.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/ListingGraphComponentPanel.java
index dbcb8cf0e4..28c6b2d5e9 100644
--- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/ListingGraphComponentPanel.java
+++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/ListingGraphComponentPanel.java
@@ -261,6 +261,11 @@ public class ListingGraphComponentPanel extends AbstractGraphComponentPanel {
 		return listingPanel.getTextBackgroundColor();
 	}
 
+	@Override
+	Color getSelectionColor() {
+		return fieldPanel.getSelectionColor();
+	}
+
 	private void createActions() {
 		String firstGroup = "group1";
 		String secondGroup = "group2";