From 4f00591c4e59802a56aeeae7d283a42ab946b672 Mon Sep 17 00:00:00 2001
From: Karl Tauber <karl@jformdesigner.com>
Date: Fri, 12 Feb 2021 11:32:12 +0100
Subject: [PATCH] Table: fixed wrong grid line thickness in dragged column on
 HiDPI screens on Java 9+ (issue #236)

---
 CHANGELOG.md                                  |  2 +
 .../com/formdev/flatlaf/ui/FlatTableUI.java   | 41 +++++++++++++++++--
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e43b3e93..18cdca94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@ FlatLaf Change Log
   `TabbedPane.foreground` has also custom color. (issue #257)
 - FileChooser: Fixed display of date in details view if current user is selected
   in "Look in" combobox. (Windows 10 only; issue #249)
+- Table: Fixed wrong grid line thickness in dragged column on HiDPI screens on
+  Java 9+. (issue #236)
 
 
 ## 1.0-rc3
diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableUI.java
index 385f7f1f..84e4edfa 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableUI.java
@@ -33,7 +33,9 @@ import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicTableUI;
+import javax.swing.table.JTableHeader;
 import com.formdev.flatlaf.util.Graphics2DProxy;
+import com.formdev.flatlaf.util.SystemInfo;
 import com.formdev.flatlaf.util.UIScale;
 
 /**
@@ -213,15 +215,18 @@ public class FlatTableUI
 			//   - do not paint last vertical grid line if line is on right edge of scroll pane
 			//   - fix unstable grid line thickness when scaled at 125%, 150%, 175%, 225%, ...
 			//     which paints either 1px or 2px lines depending on location
+			//   - on Java 9+, fix wrong grid line thickness in dragged column
 
 			boolean hideLastVerticalLine = hideLastVerticalLine();
 			int tableWidth = table.getWidth();
+			JTableHeader header = table.getTableHeader();
+			boolean isDragging = (header != null && header.getDraggedColumn() != null);
 
 			double systemScaleFactor = UIScale.getSystemScaleFactor( (Graphics2D) g );
 			double lineThickness = (1. / systemScaleFactor) * (int) systemScaleFactor;
 
 			// Java 8 uses drawLine() to paint grid lines
-			// Java 9+ uses fillRect() to paint grid lines
+			// Java 9+ uses fillRect() to paint grid lines (except for dragged column)
 			g = new Graphics2DProxy( (Graphics2D) g ) {
 				@Override
 				public void drawLine( int x1, int y1, int x2, int y2 ) {
@@ -231,6 +236,22 @@ public class FlatTableUI
 						wasInvokedFromPaintGrid() )
 					  return;
 
+					// on Java 9+, fix wrong grid line thickness in dragged column
+					if( isDragging &&
+						SystemInfo.isJava_9_orLater &&
+						((horizontalLines && y1 == y2) || (verticalLines && x1 == x2)) &&
+						wasInvokedFromPaintDraggedArea() )
+					{
+						if( y1 == y2 ) {
+							// horizontal grid line
+							super.fill( new Rectangle2D.Double( x1, y1, x2 - x1 + 1, lineThickness ) );
+						} else if( x1 == x2 ) {
+							// vertical grid line
+							super.fill( new Rectangle2D.Double( x1, y1, lineThickness, y2 - y1 + 1 ) );
+						}
+						return;
+					}
+
 					super.drawLine( x1, y1, x2, y2 );
 				}
 
@@ -258,11 +279,23 @@ public class FlatTableUI
 				}
 
 				private boolean wasInvokedFromPaintGrid() {
+					return wasInvokedFromMethod( "paintGrid" );
+				}
+
+				private boolean wasInvokedFromPaintDraggedArea() {
+					return wasInvokedFromMethod( "paintDraggedArea" );
+				}
+
+				private boolean wasInvokedFromMethod( String methodName ) {
 					StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
 					for( int i = 0; i < 10 || i < stackTrace.length; i++ ) {
-						if( "javax.swing.plaf.basic.BasicTableUI".equals( stackTrace[i].getClassName() ) &&
-							"paintGrid".equals( stackTrace[i].getMethodName() ) )
-						  return true;
+						if( "javax.swing.plaf.basic.BasicTableUI".equals( stackTrace[i].getClassName() ) ) {
+							String methodName2 = stackTrace[i].getMethodName();
+							if( "paintCell".equals( methodName2 ) )
+								return false;
+							if( methodName.equals( methodName2 ) )
+								return true;
+						}
 					}
 					return false;
 				}