mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-07-30 07:18:37 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1-dragonmacher-table-exception-fix'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-06-30 06:19:06 -04:00
parent 993edc4eee 329938f3e1
commit 0c30b3b6d1
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GTable.java
View File

@@ -124,7 +124,6 @@ public class GTable extends JTable {
private Integer visibleRowCount; private Integer visibleRowCount;
private int userDefinedRowPadding; private int userDefinedRowPadding;
private int userDefinedRowHeight;
private TableModelListener rowHeightListener; private TableModelListener rowHeightListener;
private TableColumnModelListener tableColumnModelListener = null; private TableColumnModelListener tableColumnModelListener = null;
@@ -595,7 +594,7 @@ public class GTable extends JTable {
} }
catch (Throwable t) { catch (Throwable t) {
// some renderers can't handle being asked to render with dummy data; use default value // some renderers can't handle being asked to render with dummy data; use default value
return userDefinedRowHeight; return super.getRowHeight() + padding;
} }
} }
@@ -628,7 +627,6 @@ public class GTable extends JTable {
public void setPreferredRowHeight(int height) { public void setPreferredRowHeight(int height) {
doSetRowHeight(height); doSetRowHeight(height);
userDefinedRowHeight = height;
} }
private void doSetRowHeight(int height) { private void doSetRowHeight(int height) {