mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-19 16:40:38 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1-dragonmacher-window-size-issue--SQUASHED'

Browse Source
This commit is contained in:
Ryan Kurtz
2025-08-26 05:20:53 -04:00
parent 4e6d7b1650 ba94153c21
commit eb7dbaa04f
3 changed files with 91 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,38 +86,27 @@ public class ByteViewerPanel extends JPanel implements LayoutModel, LayoutListen
editColor = ByteViewerComponentProvider.CHANGED_VALUE_COLOR;
}
/**
* Return the size that this component would like to be.
*/
@Override
public Dimension getPreferredSize() {
Dimension dim = getSize();
// calculate dimension
int width = 0;
int height = 20 * fontHeight + statusPanel.getHeight();
if (dim != null) {
height += dim.height;
int rowCount = 20;
int rowsHeight = rowCount * fontHeight;
int defaultHeight = rowsHeight + statusPanel.getHeight();
if (viewList.isEmpty()) {
// add 20 for border layout vertical gap
int width = statusPanel.getPreferredSize().width + 20;
return new Dimension(width, defaultHeight);
}
boolean addHeight = true;
int width = indexPanel.getPreferredSize().width;
int height = defaultHeight;
for (ByteViewerComponent c : viewList) {
Dimension d = c.getPreferredSize();
width += d.width;
width += 2; // for separator
if (addHeight) {
height += d.height;
addHeight = false;
}
width += d.width + 2; // +2 for separator
height = Math.max(d.height, defaultHeight);
}
if (width == 0) {
width = statusPanel.getPreferredSize().width + 20; // add 20 for
// border layout vertical gap
}
else {
width += indexPanel.getPreferredSize().width;
}
return new Dimension(width, height);
}
@@ -126,9 +115,6 @@ public class ByteViewerPanel extends JPanel implements LayoutModel, LayoutListen
super.paintComponent(g);
}
//////////////////////////////////////////////////////////////////////////
// ** package-level methods **
//////////////////////////////////////////////////////////////////////////
void setCurrentCursorColor(Color c) {
currentCursorColor = c;
for (ByteViewerComponent comp : viewList) {