Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-07 22:40:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed sub-pixel text rendering in animated theme change; use weak hash map for static map to avoid memory leak for the case that something went wrong

Browse Source
This commit is contained in:
Karl Tauber
2020-08-31 16:20:20 +02:00
parent 6da220f36c
commit faffc9393d
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -24,6 +24,8 @@ FlatLaf Change Log
window is inactive. window is inactive.
- Custom window decorations: Fixed title pane background color in IntelliJ - Custom window decorations: Fixed title pane background color in IntelliJ
themes if window is inactive. themes if window is inactive.
- Fixed sub-pixel text rendering in animated theme change (see
[FlatLaf Extras](flatlaf-extras)).
#### Other Changes #### Other Changes

27
flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatAnimatedLafChange.java
View File

@@ -19,10 +19,10 @@ package com.formdev.flatlaf.extras;
import java.awt.AlphaComposite; import java.awt.AlphaComposite;
import java.awt.Graphics; import java.awt.Graphics;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.Image;
import java.awt.Window; import java.awt.Window;
import java.util.HashMap; import java.awt.image.VolatileImage;
import java.util.Map; import java.util.Map;
import java.util.WeakHashMap;
import javax.swing.JComponent; import javax.swing.JComponent;
import javax.swing.JLayeredPane; import javax.swing.JLayeredPane;
import javax.swing.RootPaneContainer; import javax.swing.RootPaneContainer;
@@ -56,7 +56,7 @@ public class FlatAnimatedLafChange
public static int resolution = 40; public static int resolution = 40;
private static Animator animator; private static Animator animator;
private static final Map<JLayeredPane, JComponent> map = new HashMap<>(); private static final Map<JLayeredPane, JComponent> map = new WeakHashMap<>();
private static float alpha; private static float alpha;
/** /**
@@ -79,10 +79,14 @@ public class FlatAnimatedLafChange
if( !(window instanceof RootPaneContainer) || !window.isShowing() ) if( !(window instanceof RootPaneContainer) || !window.isShowing() )
continue; continue;
JLayeredPane layeredPane = ((RootPaneContainer)window).getLayeredPane(); // create snapshot image
// (using volatile image to have correct sub-pixel text rendering on Java 9+)
VolatileImage snapshot = window.createVolatileImage( window.getWidth(), window.getHeight() );
if( snapshot == null )
continue;
// create snapshot image of layered pane // paint window to snapshot image
Image snapshot = window.createImage( window.getWidth(), window.getHeight() ); JLayeredPane layeredPane = ((RootPaneContainer)window).getLayeredPane();
layeredPane.paint( snapshot.getGraphics() ); layeredPane.paint( snapshot.getGraphics() );
// create snapshot layer, which is added to layered pane and paints // create snapshot layer, which is added to layered pane and paints
@@ -90,9 +94,20 @@ public class FlatAnimatedLafChange
JComponent snapshotLayer = new JComponent() { JComponent snapshotLayer = new JComponent() {
@Override @Override
public void paint( Graphics g ) { public void paint( Graphics g ) {
if( snapshot.contentsLost() )
return;
((Graphics2D)g).setComposite( AlphaComposite.getInstance( AlphaComposite.SRC_OVER, alpha ) ); ((Graphics2D)g).setComposite( AlphaComposite.getInstance( AlphaComposite.SRC_OVER, alpha ) );
g.drawImage( snapshot, 0, 0, null ); g.drawImage( snapshot, 0, 0, null );
} }
@Override
public void removeNotify() {
super.removeNotify();
// release system resources used by volatile image
snapshot.flush();
}
}; };
snapshotLayer.setSize( layeredPane.getSize() ); snapshotLayer.setSize( layeredPane.getSize() );