Streamlined foreground background setup for cells. Enabled status of …

…cell and parent is now respected.

Removed more unused properties.

core/src/main/java/com/github/weisj/darklaf/task/ThemeDefaultsInitTask.java

@@ -40,7 +40,7 @@ public class ThemeDefaultsInitTask implements DefaultsInitTask {
 
     private static final String GLOBAL_PREFIX = "global.";
     private static final String MAC_OS_MENU_BAR_KEY = "apple.laf.useScreenMenuBar";
-    private static final String[] UI_PROPERTIES = new String[]{"borders", "button", "checkBox", "colorChooser",
+    private static final String[] UI_PROPERTIES = new String[]{"borders", "button", "cell", "checkBox", "colorChooser",
                                                                "comboBox", "fileChooser", "tristate",
                                                                "internalFrame", "label", "list", "menu", "menuBar",
                                                                "menuItem", "numberingPane", "optionPane", "panel",

core/src/main/java/com/github/weisj/darklaf/task/UtilityDefaultsInitTask.java

@@ -30,6 +30,7 @@
 import com.github.weisj.darklaf.icons.AwareIconStyle;
 import com.github.weisj.darklaf.icons.IconLoader;
 import com.github.weisj.darklaf.theme.Theme;
+import com.github.weisj.darklaf.ui.cell.CellUtil;
 
 public class UtilityDefaultsInitTask implements DefaultsInitTask {
     @Override
@@ -54,6 +55,8 @@ private void setupUtils(final Theme currentTheme, final UIDefaults defaults) {
 
         IconLoader.updateAwareStyle(Theme.isDark(currentTheme) ? AwareIconStyle.DARK : AwareIconStyle.LIGHT);
         IconLoader.updateThemeStatus(currentTheme);
+
+        CellUtil.updateColors(defaults);
     }
 
     private float getOpacity(final UIDefaults defaults, final String key) {

core/src/main/java/com/github/weisj/darklaf/ui/cell/DarkCellRendererPane.java

@@ -0,0 +1,31 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 Jannis Weis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+package com.github.weisj.darklaf.ui.cell;
+
+import java.awt.*;
+
+import javax.swing.*;
+
+public class DarkCellRendererPane extends CellRendererPane {}

core/src/main/java/com/github/weisj/darklaf/ui/cell/DarkCellRendererToggleButton.java

@@ -32,7 +32,6 @@
 
 import com.github.weisj.darklaf.components.SelectableTreeNode;
 import com.github.weisj.darklaf.ui.table.DarkTableCellFocusBorder;
-import com.github.weisj.darklaf.ui.table.DarkTableUI;
 import com.github.weisj.darklaf.ui.togglebutton.ToggleButtonConstants;
 import com.github.weisj.darklaf.ui.tree.DarkTreeCellRenderer;
 import com.github.weisj.darklaf.util.DarkUIUtil;
@@ -65,11 +64,8 @@ public Component getTableCellRendererComponent(final JTable table, final Object
                                       && focus && !DarkTableCellFocusBorder.isRowFocusBorder(table);
         boolean paintSelected = isSelected && !isLeadSelectionCell && !table.isEditing();
 
-        CellUtil.setupForeground(toggleButton, table, paintSelected,
-                                 "Table.selectionForeground", "Table.selectionForegroundInactive");
-        CellUtil.setupBackground(toggleButton, table, paintSelected, row, DarkTableUI.KEY_ALTERNATE_ROW_COLOR,
-                                 "Table.background", "Table.alternateRowBackground",
-                                 "Table.selectionNoFocusBackground");
+        CellUtil.setupTableForeground(toggleButton, table, paintSelected);
+        CellUtil.setupTableBackground(toggleButton, table, paintSelected, row);
         return toggleButton;
     }
 
@@ -89,8 +85,7 @@ public Component getTreeCellRendererComponent(final JTree tree, final Object val
         toggleButton.setHorizontalAlignment(tree.getComponentOrientation().isLeftToRight() ? LEFT : RIGHT);
         toggleButton.setHasFocus(false);
 
-        CellUtil.setupForeground(toggleButton, tree, selected,
-                                 "Tree.selectionForeground", "Tree.selectionForegroundInactive");
+        CellUtil.setupTreeForeground(toggleButton, tree, selected);
 
         return toggleButton;
     }

core/src/main/java/com/github/weisj/darklaf/ui/filechooser/DarkFilePaneUIBridge.java

@@ -48,9 +48,9 @@
 import sun.swing.FilePane;
 
 import com.github.weisj.darklaf.ui.list.DarkListCellRenderer;
-import com.github.weisj.darklaf.ui.table.DarkTableCellEditor;
-import com.github.weisj.darklaf.ui.table.DarkTableCellRenderer;
 import com.github.weisj.darklaf.ui.table.TextTableCellEditorBorder;
+import com.github.weisj.darklaf.ui.table.renderer.DarkTableCellEditor;
+import com.github.weisj.darklaf.ui.table.renderer.DarkTableCellRenderer;
 import com.github.weisj.darklaf.util.PropertyKey;
 
 /**

core/src/main/java/com/github/weisj/darklaf/ui/label/DarkLabelUI.java

@@ -36,10 +36,8 @@
 
 import com.github.weisj.darklaf.graphics.GraphicsContext;
 import com.github.weisj.darklaf.graphics.PaintUtil;
-import com.github.weisj.darklaf.ui.cell.CellUtil;
 import com.github.weisj.darklaf.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyKey;
-import com.github.weisj.darklaf.util.PropertyUtil;
 
 /**
  * @author Jannis Weis
@@ -49,10 +47,6 @@ public class DarkLabelUI extends BasicLabelUI implements PropertyChangeListener
     protected static final DarkLabelUI darkLabelUI = new DarkLabelUI();
 
     private Color inactiveForeground;
-    private Color cellForegroundNoFocus;
-    private Color cellInactiveForeground;
-    private Color cellInactiveForegroundSelectedNoFocus;
-    private Color cellInactiveForegroundSelected;
 
     protected final Rectangle paintIconR = new Rectangle();
     protected final Rectangle paintTextR = new Rectangle();
@@ -75,10 +69,6 @@ protected void installDefaults(final JLabel c) {
         super.installDefaults(c);
         LookAndFeel.installProperty(c, PropertyKey.OPAQUE, false);
         inactiveForeground = UIManager.getColor("Label.inactiveForeground");
-        cellForegroundNoFocus = UIManager.getColor("Label.cellForegroundNoFocus");
-        cellInactiveForeground = UIManager.getColor("Label.cellInactiveForeground");
-        cellInactiveForegroundSelected = UIManager.getColor("Label.cellInactiveForegroundSelected");
-        cellInactiveForegroundSelectedNoFocus = UIManager.getColor("Label.cellInactiveForegroundSelectedNoFocus");
     }
 
     @Override
@@ -113,44 +103,17 @@ public void paint(final Graphics g, final JComponent c) {
     protected void paintEnabledText(final JLabel l, final Graphics g, final String s,
                                     final int textX, final int textY) {
         int mnemIndex = l.getDisplayedMnemonicIndex();
-        if (DarkUIUtil.isInCell(l) && !hasFocusInCell(l)) {
-            g.setColor(cellForegroundNoFocus);
-        } else {
-            g.setColor(l.getForeground());
-        }
+        g.setColor(l.getForeground());
         SwingUtilities2.drawStringUnderlineCharAt(l, g, s, mnemIndex,
                                                   textX, textY);
     }
 
-    protected boolean hasFocusInCell(final JLabel l) {
-        return (DarkUIUtil.hasFocus(l)
-                || DarkUIUtil.hasFocus(DarkUIUtil.getParentOfType(JTree.class, l))
-                || DarkUIUtil.hasFocus(DarkUIUtil.getParentOfType(JTable.class, l))
-                || DarkUIUtil.hasFocus(DarkUIUtil.getParentOfType(JList.class, l))
-                || DarkUIUtil.getParentOfType(JPopupMenu.class, l) != null);
-    }
-
     @Override
     protected void paintDisabledText(final JLabel l, final Graphics g, final String s,
                                      final int textX, final int textY) {
         int accChar = l.getDisplayedMnemonicIndex();
-        if (DarkUIUtil.isInCell(l)) {
-            boolean selected = PropertyUtil.getBooleanProperty(l, CellUtil.KEY_SELECTED_CELL_RENDERER);
-            boolean focused = hasFocusInCell(l);
-            if (focused) {
-                if (selected) {
-                    g.setColor(cellInactiveForegroundSelected);
-                } else {
-                    g.setColor(cellInactiveForeground);
-                }
-            } else {
-                if (selected) {
-                    g.setColor(cellInactiveForegroundSelectedNoFocus);
-                } else {
-                    g.setColor(inactiveForeground);
-                }
-            }
-        } else {
+        g.setColor(l.getForeground());
+        if (!DarkUIUtil.isInCell(l)) {
             g.setColor(inactiveForeground);
         }
         SwingUtilities2.drawStringUnderlineCharAt(l, g, s, accChar,

core/src/main/java/com/github/weisj/darklaf/ui/list/DarkListCellRenderer.java

@@ -29,7 +29,6 @@
 import javax.swing.*;
 
 import com.github.weisj.darklaf.ui.cell.CellUtil;
-import com.github.weisj.darklaf.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyUtil;
 
 public class DarkListCellRenderer extends DefaultListCellRenderer {
@@ -55,19 +54,8 @@ public Component getListCellRendererComponent(final JList<?> list, final Object
         if (comp == null) {
             comp = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
         }
-        CellUtil.setupBackground(comp, list, isSelected, index, DarkListUI.KEY_ALTERNATE_ROW_COLOR,
-                                 "List.alternateRowBackground",
-                                 "List.selectionNoFocusBackground");
-        if (!(isSelected)) {
-            comp.setForeground(list.getForeground());
-        } else {
-            if (DarkUIUtil.hasFocus(list) || DarkUIUtil.getParentOfType(JPopupMenu.class, list) != null) {
-                comp.setForeground(list.getSelectionForeground());
-                comp.setBackground(list.getSelectionBackground());
-            } else {
-                comp.setForeground(UIManager.getColor("List.selectionForegroundInactive"));
-            }
-        }
+        CellUtil.setupListBackground(comp, list, isSelected, index);
+        CellUtil.setupListForeground(comp, list, isSelected);
         if (getText().isEmpty()) {
             // Fix cell height for empty string.
             setText(" ");

core/src/main/java/com/github/weisj/darklaf/ui/list/DarkListUI.java

@@ -31,6 +31,7 @@
 import javax.swing.*;
 import javax.swing.plaf.ComponentUI;
 
+import com.github.weisj.darklaf.ui.cell.DarkCellRendererPane;
 import com.github.weisj.darklaf.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyUtil;
 
@@ -61,9 +62,14 @@ public static ComponentUI createUI(final JComponent list) {
     @Override
     protected void installDefaults() {
         super.installDefaults();
+        rendererPane = createCellRendererPane();
         PropertyUtil.installBooleanProperty(list, KEY_ALTERNATE_ROW_COLOR, "List.alternateRowColor");
     }
 
+    protected CellRendererPane createCellRendererPane() {
+        return new DarkCellRendererPane();
+    }
+
     @Override
     protected Handler getHandler() {
         if (handler == null) {