Merge remote-tracking branch 'origin/Ghidra_11.3'

This commit is contained in:
ghidra1 2025-01-07 17:29:26 -05:00
commit 409efdfaee
2 changed files with 1 additions and 4 deletions

View file

@ -1105,7 +1105,7 @@ public class BitFieldPlacementComponent extends JPanel implements Scrollable {
int allocationEndOffset = offset + allocationBytes - 1; int allocationEndOffset = offset + allocationBytes - 1;
int numComponents = struct.getNumComponents(); int numComponents = struct.getNumComponents();
DataTypeComponent component = struct.getDefinedComponentAtOrAfterOffset(offset); DataTypeComponent component = struct.getComponentContaining(offset);
while (component != null) { while (component != null) {
if (component.getOffset() > allocationEndOffset) { if (component.getOffset() > allocationEndOffset) {
break; break;

View file

@ -195,9 +195,6 @@ public class CompEditorPanel extends CompositeEditorPanel {
model.setSelection(new int[] { dtc.getOrdinal() }); model.setSelection(new int[] { dtc.getOrdinal() });
table.scrollToSelectedRow(); table.scrollToSelectedRow();
} }
else {
model.setSelection(new FieldSelection());
}
} }
}); });