yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 19:42:36 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0-dragonmacher-test-fixes-3-21-23'

Browse source
This commit is contained in:
Ryan Kurtz 2023-03-21 08:49:28 -04:00
commit 78171efe34
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompositeEditorTableAction.java
View file

@ -82,16 +82,16 @@ abstract public class CompositeEditorTableAction extends DockingAction implement
}
JTable table = ((CompositeEditorPanel) provider.getComponent()).getTable();
if (table instanceof GTable gTable) {
gTable.requestTableFocus();
if (!table.isEditing()) {
table.requestFocus();
return;
}
if (table.isEditing()) {
table.getEditorComponent().requestFocus();
if (table instanceof GTable gTable) {
gTable.requestTableEditorFocus();
}
else {
table.requestFocus();
table.getEditorComponent().requestFocus();
}
}

8
Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GTable.java
View file

@ -940,14 +940,18 @@ public class GTable extends JTable {
public boolean editCellAt(int row, int column, EventObject e) {
boolean editAtCell = super.editCellAt(row, column, e);
if (editAtCell) {
requestTableFocus();
requestTableEditorFocus();
}
return editAtCell;
}
public void requestTableFocus() {
public void requestTableEditorFocus() {
TableCellEditor currentEditor = getCellEditor();
Component editorComponent = getEditorComponent();
if (editorComponent == null) {
return; // not editing
}
if (currentEditor instanceof FocusableEditor focusable) {
focusable.focusEditor();
}