github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-09 14:08:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

GP-6142 - Hovers - Fixed default tootip padding bug

Browse Source
This commit is contained in:
dragonmacher
2025-11-19 17:00:55 -05:00
parent 8c39f94c8a
commit fd0902b14d
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/hover/DataTypeListingHover.java
View File

@@ -139,18 +139,16 @@ public class DataTypeListingHover extends AbstractConfigurableHover implements L
}
StringBuilder sb = new StringBuilder(HTMLUtilities.HTML);
sb.append("<TABLE>");
if (parent != null) {
DataType parentType = parent.getDataType();
sb.append(row("Parent: ", parentType.getDataTypePath()));
int offset = (int) data.getAddress().subtract(parent.getAddress());
sb.append(row("Offset: ", NumericUtilities.toHexString(offset)));
sb.append(row("Field Name: ", nameLoc.getFieldName()));
if (parentType instanceof Structure pst) {
DataTypeComponent dtc = pst.getComponentAt(offset);
String comment = dtc == null ? null : dtc.getComment();
if (comment != null) {
sb.append(row("Comment: ", comment));
}
DataType parentType = parent.getDataType();
sb.append(row("Parent: ", parentType.getDataTypePath()));
int offset = (int) data.getAddress().subtract(parent.getAddress());
sb.append(row("Offset: ", NumericUtilities.toHexString(offset)));
sb.append(row("Field Name: ", nameLoc.getFieldName()));
if (parentType instanceof Structure pst) {
DataTypeComponent dtc = pst.getComponentAt(offset);
String comment = dtc == null ? null : dtc.getComment();
if (comment != null) {
sb.append(row("Comment: ", comment));
}
}
sb.append("</TABLE>");

8
Ghidra/Framework/Docking/src/main/java/docking/widgets/PopupWindow.java
View File

@@ -38,8 +38,8 @@ import util.CollectionUtils;
* the window will be closed.
*/
public class PopupWindow {
private static final int X_PADDING = 25;
private static final int Y_PADDING = 25;
private static final int X_PADDING = 15;
private static final int Y_PADDING = 15;
private static final List<WeakReference<PopupWindow>> VISIBLE_POPUPS = new ArrayList<>();
public static void hideAllWindows() {
@@ -370,9 +370,7 @@ public class PopupWindow {
if (CollectionUtils.isAllNull(location, keepVisibleArea)) {
throw new NullPointerException("Both location and keepVisibleArea cannot be null");
}
if (keepVisibleArea == null) {
keepVisibleArea = new Rectangle(location, new Dimension(0, 0));
}
this.location = location;
this.source = source;
this.screenKeepVisibleArea = createScreenKeepVisibleArea(location, keepVisibleArea);