Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-01 14:28:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-3798-dragonmacher-fg-flow-color-fix'

Browse Source
This commit is contained in:
Ryan Kurtz
2023-08-30 10:52:06 -04:00
parent a3453936ae 10279fc2ad
commit 4719ee1e10
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/jung/renderer/FGEdgeRenderer.java
+8 -5
View File
@@ -23,10 +23,9 @@ import ghidra.app.plugin.core.functiongraph.graph.FunctionGraph;
import ghidra.app.plugin.core.functiongraph.graph.vertex.FGVertex;
import ghidra.app.plugin.core.functiongraph.mvc.FunctionGraphOptions;
import ghidra.graph.viewer.renderer.ArticulatedEdgeRenderer;
import ghidra.program.model.symbol.FlowType;
/**
* A renderer used by the Function Graph API to provide additional edge coloring, as
* A renderer used by the Function Graph API to provide additional edge coloring, as
* determined by the {@link FunctionGraphOptions}.
*/
public class FGEdgeRenderer extends ArticulatedEdgeRenderer<FGVertex, FGEdge> {
@@ -34,9 +33,7 @@ public class FGEdgeRenderer extends ArticulatedEdgeRenderer<FGVertex, FGEdge> {
@Override
public Color getDrawColor(Graph<FGVertex, FGEdge> g, FGEdge e) {
FunctionGraphOptions options = getOptions(g);
FlowType flowType = e.getFlowType();
Color color = options.getColor(flowType);
return color;
return options.getColor(e.getFlowType());
}
@Override
@@ -51,6 +48,12 @@ public class FGEdgeRenderer extends ArticulatedEdgeRenderer<FGVertex, FGEdge> {
return options.getHighlightColor(e.getFlowType());
}
@Override
public Color getHoveredColor(Graph<FGVertex, FGEdge> g, FGEdge e) {
FunctionGraphOptions options = getOptions(g);
return options.getColor(e.getFlowType());
}
private FunctionGraphOptions getOptions(Graph<FGVertex, FGEdge> g) {
FunctionGraph fg = (FunctionGraph) g;
return fg.getOptions();