angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-12 23:07:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

Table: fixed unstable grid line thickness when scaled on HiDPI screens (issue #152)

Browse Source
This commit is contained in:
Karl Tauber
2020-11-28 23:20:58 +01:00
parent aefed7c481
commit 5ef0c9aae1
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -14,6 +14,8 @@ FlatLaf Change Log
property `JTabbedPane.hideTabAreaWithOneTab` to `true`) property `JTabbedPane.hideTabAreaWithOneTab` to `true`)
- Table: Do not paint last vertical grid line if auto-resize mode is not off. - Table: Do not paint last vertical grid line if auto-resize mode is not off.
(issue #46) (issue #46)
- Table: Fixed unstable grid line thickness when scaled on HiDPI screens. (issue
#152)
#### Fixed bugs #### Fixed bugs

26
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableUI.java
View File

@@ -23,6 +23,7 @@ import java.awt.Graphics;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.event.FocusEvent; import java.awt.event.FocusEvent;
import java.awt.event.FocusListener; import java.awt.event.FocusListener;
import java.awt.geom.Rectangle2D;
import javax.swing.JCheckBox; import javax.swing.JCheckBox;
import javax.swing.JComponent; import javax.swing.JComponent;
import javax.swing.JTable; import javax.swing.JTable;
@@ -210,25 +211,32 @@ public class FlatTableUI
@Override @Override
public void paint( Graphics g, JComponent c ) { public void paint( Graphics g, JComponent c ) {
if( table.getShowVerticalLines() ) { boolean horizontalLines = table.getShowHorizontalLines();
boolean verticalLines = table.getShowVerticalLines();
if( horizontalLines || verticalLines ) {
// fix grid painting issues in BasicTableUI // fix grid painting issues in BasicTableUI
// - do not paint last vertical grid line if auto-resize mode is not off // - do not paint last vertical grid line if auto-resize mode is not off
// - in right-to-left component orientation, do not paint last vertical grid line // - in right-to-left component orientation, do not paint last vertical grid line
// in any auto-resize mode; can not paint on left side of table because // in any auto-resize mode; can not paint on left side of table because
// cells are painted over left line // cells are painted over left line
// - fix unstable grid line thickness when scaled at 125%, 150%, 175%, 225%, ...
// which paints either 1px or 2px lines depending on location
boolean hideLastVerticalLine = boolean hideLastVerticalLine =
table.getAutoResizeMode() != JTable.AUTO_RESIZE_OFF || table.getAutoResizeMode() != JTable.AUTO_RESIZE_OFF ||
!table.getComponentOrientation().isLeftToRight(); !table.getComponentOrientation().isLeftToRight();
int tableWidth = table.getWidth(); int tableWidth = table.getWidth();
double systemScaleFactor = UIScale.getSystemScaleFactor( (Graphics2D) g );
double lineThickness = (1. / systemScaleFactor) * (int) systemScaleFactor;
// Java 8 uses drawLine() to paint grid lines // Java 8 uses drawLine() to paint grid lines
// Java 9+ uses fillRect() to paint grid lines // Java 9+ uses fillRect() to paint grid lines
g = new Graphics2DProxy( (Graphics2D) g ) { g = new Graphics2DProxy( (Graphics2D) g ) {
@Override @Override
public void drawLine( int x1, int y1, int x2, int y2 ) { public void drawLine( int x1, int y1, int x2, int y2 ) {
// do not paint last vertical line // do not paint last vertical line
if( hideLastVerticalLine && if( hideLastVerticalLine && verticalLines &&
x1 == x2 && y1 == 0 && x1 == tableWidth - 1 && x1 == x2 && y1 == 0 && x1 == tableWidth - 1 &&
wasInvokedFromPaintGrid() ) wasInvokedFromPaintGrid() )
return; return;
@@ -239,11 +247,23 @@ public class FlatTableUI
@Override @Override
public void fillRect( int x, int y, int width, int height ) { public void fillRect( int x, int y, int width, int height ) {
// do not paint last vertical line // do not paint last vertical line
if( hideLastVerticalLine && if( hideLastVerticalLine && verticalLines &&
width == 1 && y == 0 && x == tableWidth - 1 && width == 1 && y == 0 && x == tableWidth - 1 &&
wasInvokedFromPaintGrid() ) wasInvokedFromPaintGrid() )
return; return;
// reduce line thickness to avoid unstable painted line thickness
if( lineThickness != 1 ) {
if( horizontalLines && height == 1 && wasInvokedFromPaintGrid() ) {
super.fill( new Rectangle2D.Double( x, y, width, lineThickness ) );
return;
}
if( verticalLines && width == 1 && y == 0 && wasInvokedFromPaintGrid() ) {
super.fill( new Rectangle2D.Double( x, y, lineThickness, height ) );
return;
}
}
super.fillRect( x, y, width, height ); super.fillRect( x, y, width, height );
} }