Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-26 22:21:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GT-3471_dragonmacher_PR-1465_saruman9_fix_byte_viewer_highlight'

Fixes #1464, fixes #1465
This commit is contained in:
ghidorahrex 2020-01-21 16:05:57 -05:00
commit b9531416c0
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/ByteViewerPanel.java
View File

@ -73,6 +73,8 @@ public class ByteViewerPanel extends JPanel implements TableColumnModelListener,
private Color currentCursorColor;
private Color cursorColor;
private Color currentCursorLineColor;
private Color highlightColor;
private int highlightButton;
private List<LayoutModelListener> layoutListeners = new ArrayList<>(1);
private int indexPanelWidth;
private boolean addingView; // don't respond to cursor location
@ -195,6 +197,7 @@ public class ByteViewerPanel extends JPanel implements TableColumnModelListener,
}
void setHighlightButton(int highlightButton) {
this.highlightButton = highlightButton;
for (int i = 0; i < viewList.size(); i++) {
ByteViewerComponent comp = viewList.get(i);
comp.setHighlightButton(highlightButton);
@ -202,6 +205,7 @@ public class ByteViewerPanel extends JPanel implements TableColumnModelListener,
}
void setMouseButtonHighlightColor(Color color) {
this.highlightColor = color;
for (int i = 0; i < viewList.size(); i++) {
ByteViewerComponent comp = viewList.get(i);
comp.setMouseButtonHighlightColor(color);
@ -404,6 +408,8 @@ public class ByteViewerPanel extends JPanel implements TableColumnModelListener,
c.setCurrentCursorLineColor(currentCursorLineColor);
c.setEditMode(editMode);
c.setIndexMap(indexMap);
c.setMouseButtonHighlightColor(highlightColor);
c.setHighlightButton(highlightButton);
viewList.add(c);
c.setSize(c.getPreferredSize());
compPanel.addByteViewerComponent(c);