From 70f0a4031a90f50c5e33c5097bc538dce74fe98c Mon Sep 17 00:00:00 2001
From: weisj <weisj@arcor.de>
Date: Wed, 18 Mar 2020 14:55:12 +0100
Subject: [PATCH] Simplified lead selection check.

---
 .../darklaf/ui/cell/DarkCellRendererToggleButton.java      | 7 +++----
 .../weisj/darklaf/ui/table/DarkTableCellRenderer.java      | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/com/github/weisj/darklaf/ui/cell/DarkCellRendererToggleButton.java b/core/src/main/java/com/github/weisj/darklaf/ui/cell/DarkCellRendererToggleButton.java
index 5ca07863..518ca1ea 100644
--- a/core/src/main/java/com/github/weisj/darklaf/ui/cell/DarkCellRendererToggleButton.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/cell/DarkCellRendererToggleButton.java
@@ -61,10 +61,9 @@ public class DarkCellRendererToggleButton<T extends JToggleButton & CellEditorTo
         toggleButton.setHorizontalAlignment(table.getComponentOrientation().isLeftToRight() ? LEFT : RIGHT);
         toggleButton.setHasFocus(focus);
 
-        boolean isLeadSelectionCell = DarkUIUtil.hasFocus(table)
-            && table.getSelectionModel().getLeadSelectionIndex() == row
-            && (table.getColumnModel().getSelectionModel().getLeadSelectionIndex() == column
-            || DarkTableCellFocusBorder.isRowFocusBorder(table));
+        boolean isLeadSelectionCell = DarkUIUtil.hasFocus(table) && (focus
+            || (table.getSelectionModel().getLeadSelectionIndex() == row
+            && DarkTableCellFocusBorder.isRowFocusBorder(table)));
 
         boolean alternativeRow = Boolean.TRUE.equals(table.getClientProperty(DarkTableUI.KEY_ALTERNATE_ROW_COLOR));
         Color alternativeRowColor = UIManager.getColor("Table.alternateRowBackground");
diff --git a/core/src/main/java/com/github/weisj/darklaf/ui/table/DarkTableCellRenderer.java b/core/src/main/java/com/github/weisj/darklaf/ui/table/DarkTableCellRenderer.java
index 918b572b..3ac5b7c8 100644
--- a/core/src/main/java/com/github/weisj/darklaf/ui/table/DarkTableCellRenderer.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/table/DarkTableCellRenderer.java
@@ -63,10 +63,9 @@ public class DarkTableCellRenderer extends DefaultTableCellRenderer {
         this.setVerticalAlignment(SwingConstants.CENTER);
         setHorizontalAlignment(table.getComponentOrientation().isLeftToRight() ? LEFT : RIGHT);
 
-        boolean isLeadSelectionCell = DarkUIUtil.hasFocus(table)
-            && table.getSelectionModel().getLeadSelectionIndex() == row
-            && (table.getColumnModel().getSelectionModel().getLeadSelectionIndex() == column
-            || DarkTableCellFocusBorder.isRowFocusBorder(table));
+        boolean isLeadSelectionCell = DarkUIUtil.hasFocus(table) && (hasFocus
+            || (table.getSelectionModel().getLeadSelectionIndex() == row
+            && DarkTableCellFocusBorder.isRowFocusBorder(table)));
 
         if (DarkTableCellFocusBorder.isRowFocusBorder(table)
             && table.getSelectionModel().getLeadSelectionIndex() == row