MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix so that UI Designer works with icon caching

Browse Source
This commit is contained in:
Dmitry Jemerov
2006-05-31 14:48:01 +04:00
parent 32cc0f2f74
commit 23ab7145e1
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui-designer/impl/com/intellij/uiDesigner/palette/ComponentItem.java
+11 -4
View File
@@ -158,7 +158,7 @@ public final class ComponentItem implements Cloneable, PaletteItem, ComponentDra
}
// Create new icon
if(myIconPath != null) {
if(myIconPath != null && myIconPath.length() > 0) {
final VirtualFile iconFile = ModuleUtil.findResourceFileInProject(myProject, myIconPath);
if (iconFile != null) {
try {
@@ -174,7 +174,7 @@ public final class ComponentItem implements Cloneable, PaletteItem, ComponentDra
}
if(myIcon == null){
myIcon = IconLoader.getIcon("/com/intellij/uiDesigner/icons/unknown.png");
}
}
LOG.assertTrue(myIcon != null);
return myIcon;
}
@@ -192,8 +192,15 @@ public final class ComponentItem implements Cloneable, PaletteItem, ComponentDra
// [vova] It's safe to cast to ImageIcon here because all icons loaded by IconLoader
// are ImageIcon(s).
final ImageIcon icon = (ImageIcon)getIcon();
mySmallIcon = new MySmallIcon(icon.getImage());
final Icon icon = getIcon();
if (icon instanceof ImageIcon) {
final ImageIcon imageIcon = (ImageIcon)icon;
mySmallIcon = new MySmallIcon(imageIcon.getImage());
}
else {
mySmallIcon = icon;
}
return mySmallIcon;
}