yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 02:39:44 +02:00
Code Issues Releases Wiki Activity

Test fixes

Browse source
This commit is contained in:
dragonmacher 2023-01-06 17:10:25 -05:00
parent 2ee1d80215
commit eb7e77defe
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Ghidra/Framework/Gui/src/main/java/resources/MultiIcon.java
View file

@ -21,6 +21,7 @@ import java.util.Objects;
import javax.swing.Icon; import javax.swing.Icon;
import generic.theme.GIcon;
import ghidra.util.ColorUtils; import ghidra.util.ColorUtils;
/** /**
@ -171,9 +172,20 @@ public class MultiIcon implements Icon {
if (buffy.length() > 0) { if (buffy.length() > 0) {
buffy.append(", "); buffy.append(", ");
} }
buffy.append(ResourceManager.getIconName(icon));
}
String name = getIconId(icon);
if (name == null) {
name = ResourceManager.getIconName(icon);
}
buffy.append(name);
}
return buffy.toString(); return buffy.toString();
} }
private String getIconId(Icon icon) {
if (icon instanceof GIcon gIcon) {
return gIcon.getId();
}
return null;
}
} }