Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-24 13:05:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GP-5468-dragonmacher-renderer-font-warning-fix' (Closes #7886)
This commit is contained in:
Ryan Kurtz
2025-03-10 11:45:32 -04:00
parent 117989eeda 88dc8a65bc
commit 73d29e3488
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/DisassembledViewPlugin.java
+4 -2
View File
@@ -392,6 +392,10 @@ public class DisassembledViewPlugin extends ProgramPlugin implements DomainObjec
// we need to do some custom rendering
contentList.setCellRenderer(new GListCellRenderer<DisassembledAddressInfo>() {
{
setBaseFontId(FieldFactory.BASE_LISTING_FONT_ID);
}
@Override
protected String getItemText(DisassembledAddressInfo value) {
return value.getAddressPreview(addressPreviewFormat);
@@ -406,8 +410,6 @@ public class DisassembledViewPlugin extends ProgramPlugin implements DomainObjec
super.getListCellRendererComponent(list, value, index, isSelected,
cellHasFocus);
setFont(Gui.getFont(FieldFactory.BASE_LISTING_FONT_ID));
setToolTipText(TOOLTIP_TEXT_PREPEND +
HTMLUtilities.escapeHTML(currentLocation.getAddress().toString()));
Ghidra/Framework/Docking/src/main/java/docking/widgets/AbstractGCellRenderer.java
+12
View File
@@ -32,6 +32,7 @@ import generic.theme.GThemeDefaults.Colors.Palette;
import generic.theme.GThemeDefaults.Colors.Tables;
import generic.theme.laf.FontChangeListener;
import ghidra.util.Msg;
import ghidra.util.SystemUtilities;
import util.CollectionUtils;
import utilities.util.reflection.ReflectionUtilities;
@@ -76,6 +77,7 @@ public abstract class AbstractGCellRenderer extends GDHtmlLabel implements FontC
protected Font fixedWidthFont;
protected Font boldFont;
protected Font italicFont;
private boolean showedFontWarning;
protected int dropRow = -1;
private boolean instanceAlternateRowColors = true;
@@ -216,6 +218,15 @@ public abstract class AbstractGCellRenderer extends GDHtmlLabel implements FontC
}
protected void checkForInvalidSetFont(Font f) {
if (!SystemUtilities.isInDevelopmentMode()) {
return;
}
if (showedFontWarning) {
return;
}
//
// Due to the nature of how setFont() is typically used (external client setup vs internal
// rendering), we created setBaseFontId() to allow external clients to set the base font in
@@ -231,6 +242,7 @@ public abstract class AbstractGCellRenderer extends GDHtmlLabel implements FontC
return; // the UI will set fonts while the theme is updating
}
showedFontWarning = true;
String caller = ReflectionUtilities
.getClassNameOlderThan(AbstractGCellRenderer.class.getName(), "generic.theme");
Msg.debug(this, "Calling setFont() on the renderer is discouraged. " +