angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-11 22:47:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

support multi-resolution images in disabled icons on Java 9+ (e.g. @2x icons on macOS) (issue #70)

Browse Source
This commit is contained in:
Karl Tauber
2020-04-24 17:07:30 +02:00
parent 0141dfbea2
commit c9c703fe98
10 changed files with 195 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatDisabledIconsTest.java
View File

@@ -27,8 +27,11 @@ import java.awt.image.FilteredImageSource;
import java.awt.image.ImageProducer;
import java.awt.image.RGBImageFilter;
import java.beans.*;
import java.net.URL;
import javax.swing.*;
import com.formdev.flatlaf.FlatLaf;
import com.formdev.flatlaf.util.MultiResolutionImageSupport;
import com.formdev.flatlaf.util.SystemInfo;
import com.formdev.flatlaf.util.UIScale;
import net.miginfocom.swing.*;
@@ -575,8 +578,23 @@ public class FlatDisabledIconsTest
private final ImageIcon darkIcon;
LightOrDarkIcon( String lightIconName, String darkIconName ) {
this.lightIcon = new ImageIcon( getClass().getResource( lightIconName ) );
this.darkIcon = new ImageIcon( getClass().getResource( darkIconName ) );
this.lightIcon = loadIcon( lightIconName );
this.darkIcon = loadIcon( darkIconName );
}
private static ImageIcon loadIcon( String iconName ) {
ImageIcon icon = new ImageIcon( LightOrDarkIcon.class.getResource( iconName ) );
if( SystemInfo.IS_MAC || !MultiResolutionImageSupport.isAvailable() || !iconName.endsWith( ".png" ) )
return icon;
String iconName2x = iconName.replace( ".png", "@2x.png" );
URL url2x = LightOrDarkIcon.class.getResource( iconName2x );
if( url2x == null )
return icon;
ImageIcon icon2x = new ImageIcon( url2x );
return new ImageIcon( MultiResolutionImageSupport.create( 0, icon.getImage(), icon2x.getImage() ) );
}
private ImageIcon getCurrentIcon() {