stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6792401: Windows LAF: ActiveWindowsIcon should not be greedy with fallback icon

Browse Source 
Fallback mechanism changed to use symbolic name instead of icon.

Reviewed-by: igor, rupashka
This commit is contained in:
Peter Zhelezniakov 2009-01-21 21:30:59 +03:00
parent e3d66c6414
commit 2d180da2de
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
View File

@ -1554,10 +1554,10 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
"Tree.selectionBackground", SelectionBackgroundColor, "Tree.selectionBackground", SelectionBackgroundColor,
"Tree.expandedIcon", treeExpandedIcon, "Tree.expandedIcon", treeExpandedIcon,
"Tree.collapsedIcon", treeCollapsedIcon, "Tree.collapsedIcon", treeCollapsedIcon,
"Tree.openIcon", new ActiveWindowsIcon("win.icon.shellIconBPP", "shell32Icon 5", "Tree.openIcon", new ActiveWindowsIcon("win.icon.shellIconBPP",
(Icon)table.get("Tree.openIcon")), "shell32Icon 5", "icons/TreeOpen.gif"),
"Tree.closedIcon", new ActiveWindowsIcon("win.icon.shellIconBPP", "shell32Icon 4", "Tree.closedIcon", new ActiveWindowsIcon("win.icon.shellIconBPP",
(Icon)table.get("Tree.closedIcon")), "shell32Icon 4", "icons/TreeClosed.gif"),
"Tree.focusInputMap", "Tree.focusInputMap",
new UIDefaults.LazyInputMap(new Object[] { new UIDefaults.LazyInputMap(new Object[] {
"ADD", "expand", "ADD", "expand",
@ -2205,21 +2205,21 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
*/ */
private class ActiveWindowsIcon implements UIDefaults.ActiveValue { private class ActiveWindowsIcon implements UIDefaults.ActiveValue {
private Icon icon; private Icon icon;
private Icon fallback;
private String nativeImageName; private String nativeImageName;
private String fallbackName;
private DesktopProperty desktopProperty; private DesktopProperty desktopProperty;
ActiveWindowsIcon(String desktopPropertyName, ActiveWindowsIcon(String desktopPropertyName,
String nativeImageName, Icon fallback) { String nativeImageName, String fallbackName) {
this.nativeImageName = nativeImageName; this.nativeImageName = nativeImageName;
this.fallback = fallback; this.fallbackName = fallbackName;
if (OSInfo.getOSType() == OSInfo.OSType.WINDOWS && if (OSInfo.getOSType() == OSInfo.OSType.WINDOWS &&
OSInfo.getWindowsVersion().compareTo(OSInfo.WINDOWS_XP) < 0) { OSInfo.getWindowsVersion().compareTo(OSInfo.WINDOWS_XP) < 0) {
// This desktop property is needed to trigger reloading the icon. // This desktop property is needed to trigger reloading the icon.
// It is kept in member variable to avoid GC. // It is kept in member variable to avoid GC.
this.desktopProperty = new TriggerDesktopProperty(desktopPropertyName) { this.desktopProperty = new TriggerDesktopProperty(desktopPropertyName) {
protected void updateUI() { @Override protected void updateUI() {
icon = null; icon = null;
super.updateUI(); super.updateUI();
} }
@ -2227,6 +2227,7 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
} }
} }
@Override
public Object createValue(UIDefaults table) { public Object createValue(UIDefaults table) {
if (icon == null) { if (icon == null) {
Image image = (Image)ShellFolder.get(nativeImageName); Image image = (Image)ShellFolder.get(nativeImageName);
@ -2234,8 +2235,11 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
icon = new ImageIconUIResource(image); icon = new ImageIconUIResource(image);
} }
} }
if (icon == null && fallback != null) { if (icon == null && fallbackName != null) {
icon = fallback; UIDefaults.LazyValue fallback = (UIDefaults.LazyValue)
SwingUtilities2.makeIcon(WindowsLookAndFeel.class,
BasicLookAndFeel.class, fallbackName);
icon = (Icon) fallback.createValue(table);
} }
return icon; return icon;
} }