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

List: fixed endless loop rounded selection painting

Browse Source
This commit is contained in:
Karl Tauber
2022-06-03 17:32:55 +02:00
parent 450fc123ff
commit 5ec7848fb0
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatListUI.java
View File

@@ -304,7 +304,7 @@ public class FlatListUI
// rounded selection or selection insets // rounded selection or selection insets
if( isSelected && if( isSelected &&
!isFileList && !isFileList && // rounded selection is not supported for file list
rendererComponent instanceof DefaultListCellRenderer && rendererComponent instanceof DefaultListCellRenderer &&
(selectionArc > 0 || (selectionArc > 0 ||
(selectionInsets != null && (selectionInsets != null &&
@@ -319,6 +319,10 @@ public class FlatListUI
// To solve this, a graphics proxy is used that paints rounded selection // To solve this, a graphics proxy is used that paints rounded selection
// if row is selected and the renderer wants to fill the background. // if row is selected and the renderer wants to fill the background.
class RoundedSelectionGraphics extends Graphics2DProxy { class RoundedSelectionGraphics extends Graphics2DProxy {
// used to avoid endless loop in case that paintCellSelection() invokes
// g.fillRect() with full bounds (selectionInsets is 0,0,0,0)
private boolean inPaintSelection;
RoundedSelectionGraphics( Graphics delegate ) { RoundedSelectionGraphics( Graphics delegate ) {
super( (Graphics2D) delegate ); super( (Graphics2D) delegate );
} }
@@ -335,10 +339,13 @@ public class FlatListUI
@Override @Override
public void fillRect( int x, int y, int width, int height ) { public void fillRect( int x, int y, int width, int height ) {
if( x == 0 && y == 0 && width == rowBounds.width && height == rowBounds.height && if( !inPaintSelection &&
x == 0 && y == 0 && width == rowBounds.width && height == rowBounds.height &&
this.getColor() == rendererComponent.getBackground() ) this.getColor() == rendererComponent.getBackground() )
{ {
inPaintSelection = true;
paintCellSelection( this, row, x, y, width, height ); paintCellSelection( this, row, x, y, width, height );
inPaintSelection = false;
} else } else
super.fillRect( x, y, width, height ); super.fillRect( x, y, width, height );
} }