Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-28 15:36:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed broken Structure Editor F2 support

Browse Source
This commit is contained in:
dragonmacher
2023-03-13 18:30:18 -04:00
parent d84d6df8f6
commit f7a5a0af7f
1 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompositeEditorPanel.java
+3 -19
View File
@@ -79,7 +79,7 @@ public abstract class CompositeEditorPanel extends JPanel
protected CompositeEditorProvider provider; protected CompositeEditorProvider provider;
protected CompositeEditorModel model; protected CompositeEditorModel model;
protected CompositeTable table; protected GTable table;
private JLabel statusLabel; private JLabel statusLabel;
private boolean editorAdjusting = false; private boolean editorAdjusting = false;
@@ -558,7 +558,7 @@ public abstract class CompositeEditorPanel extends JPanel
} }
private void createTable() { private void createTable() {
table = new CompositeTable(model); table = new GTable(model);
TableColumnModel columnModel = table.getColumnModel(); TableColumnModel columnModel = table.getColumnModel();
if (columnModel instanceof GTableColumnModel) { if (columnModel instanceof GTableColumnModel) {
@@ -1332,7 +1332,7 @@ public abstract class CompositeEditorPanel extends JPanel
@Override @Override
public void focusEditor() { public void focusEditor() {
textField.requestFocusInWindow(); boolean didFocus = textField.requestFocusInWindow();
} }
@Override @Override
@@ -1490,20 +1490,4 @@ public abstract class CompositeEditorPanel extends JPanel
e.consume(); e.consume();
} }
} }
class CompositeTable extends GTable {
public CompositeTable(TableModel dm) {
super(dm);
}
@Override
// overridden because the editor component was not being given focus
public Component prepareEditor(TableCellEditor editor, int row, int column) {
final Component component = super.prepareEditor(editor, row, column);
Swing.runLater(() -> component.requestFocus());
return component;
}
}
} }