yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 02:09:44 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch

Browse source 
'origin/GP-2901-dragonmacher-theme-property-update'

Conflicts:
	Ghidra/Framework/Docking/data/docking.theme.properties
This commit is contained in:
Ryan Kurtz 2022-12-16 14:15:15 -05:00
commit d7f7bf9a66
31 changed files with 171 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Features/ProgramDiff/src/main/java/ghidra/app/plugin/core/diff/ProgramDiffPlugin.java
View file

@ -99,7 +99,7 @@ public class ProgramDiffPlugin extends ProgramPlugin
private static final String SELECTION_GROUP = "Selection Colors";
private static final String DIFF_HIGHLIGHT_COLOR_NAME =
SELECTION_GROUP + Options.DELIMITER + "Difference Color";
private GColor diffHighlightColor = new GColor("color.bg.programdiff.highlight");
private GColor diffHighlightColor = new GColor("color.bg.plugin.programdiff.highlight");
private Color cursorHighlightColor = GhidraOptions.DEFAULT_CURSOR_LINE_COLOR;
protected static final HelpService help = Help.getHelpService();