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

TableHeader: fixed position of column separators in right-to-left component orientation; do not paint anything if column count is zero

Browse Source
This commit is contained in:
Karl Tauber
2020-12-09 00:33:01 +01:00
parent 81c35eab46
commit cfbe44b946
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -5,6 +5,8 @@ FlatLaf Change Log
#### Fixed bugs #### Fixed bugs
- TableHeader: Fixed position of column separators in right-to-left component
orientation.
- SwingX: Fixed striping background highlighting color (e.g. alternating table - SwingX: Fixed striping background highlighting color (e.g. alternating table
rows) in dark themes. rows) in dark themes.

8
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableHeaderUI.java
View File

@@ -98,10 +98,13 @@ public class FlatTableHeaderUI
@Override @Override
public void paint( Graphics g, JComponent c ) { public void paint( Graphics g, JComponent c ) {
if( header.getColumnModel().getColumnCount() <= 0 )
return;
// do not paint borders if JTableHeader.setDefaultRenderer() was used // do not paint borders if JTableHeader.setDefaultRenderer() was used
TableCellRenderer defaultRenderer = header.getDefaultRenderer(); TableCellRenderer defaultRenderer = header.getDefaultRenderer();
boolean paintBorders = isSystemDefaultRenderer( defaultRenderer ); boolean paintBorders = isSystemDefaultRenderer( defaultRenderer );
if( !paintBorders && header.getColumnModel().getColumnCount() > 0 ) { if( !paintBorders ) {
// check whether the renderer delegates to the system default renderer // check whether the renderer delegates to the system default renderer
Component rendererComponent = defaultRenderer.getTableCellRendererComponent( Component rendererComponent = defaultRenderer.getTableCellRendererComponent(
header.getTable(), "", false, false, -1, 0 ); header.getTable(), "", false, false, -1, 0 );
@@ -168,7 +171,8 @@ public class FlatTableHeaderUI
g2.fill( new Rectangle2D.Float( x - lineWidth, topLineIndent, lineWidth, height - bottomLineIndent ) ); g2.fill( new Rectangle2D.Float( x - lineWidth, topLineIndent, lineWidth, height - bottomLineIndent ) );
} }
} else { } else {
int x = width; Rectangle cellRect = header.getHeaderRect( 0 );
int x = cellRect.x + cellRect.width;
for( int i = 0; i < sepCount; i++ ) { for( int i = 0; i < sepCount; i++ ) {
x -= columnModel.getColumn( i ).getWidth(); x -= columnModel.getColumn( i ).getWidth();
g2.fill( new Rectangle2D.Float( x - (i < sepCount - 1 ? lineWidth : 0), g2.fill( new Rectangle2D.Float( x - (i < sepCount - 1 ? lineWidth : 0),