mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0-dragonmacher-test-fixes-1-1-23'

Browse Source
This commit is contained in:
Ryan Kurtz
2023-01-09 05:57:11 -05:00
parent 0f3bb2acee eb7e77defe
commit c1b72a3569
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 generic.theme.GIcon;
import ghidra.util.ColorUtils;
/**
@@ -171,9 +172,20 @@ public class MultiIcon implements Icon {
if (buffy.length() > 0) {
buffy.append(", ");
}
buffy.append(ResourceManager.getIconName(icon));
}
String name = getIconId(icon);
if (name == null) {
name = ResourceManager.getIconName(icon);
}
buffy.append(name);
}
return buffy.toString();
}
private String getIconId(Icon icon) {
if (icon instanceof GIcon gIcon) {
return gIcon.getId();
}
return null;
}
}