[Swingme-svn] SF.net SVN: swingme:[2400] SwingME/src/net/yura/mobile/gui

[<yu...@us...>]

Revision: 2400
          http://sourceforge.net/p/swingme/code/2400
Author:   yuranet
Date:     2021-02-24 16:13:40 +0000 (Wed, 24 Feb 2021)
Log Message:
-----------
allow list items to inherit foreground from parent

Modified Paths:
--------------
    SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultListCellRenderer.java
    SwingME/src/net/yura/mobile/gui/cellrenderer/ListCellRenderer.java
    SwingME/src/net/yura/mobile/gui/components/Component.java
    SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java

Modified: SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultListCellRenderer.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultListCellRenderer.java	2021-02-24 12:28:13 UTC (rev 2399)
+++ SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultListCellRenderer.java	2021-02-24 16:13:40 UTC (rev 2400)
@@ -36,9 +36,14 @@
 	/**
          * @see javax.swing.DefaultListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) DefaultListCellRenderer.getListCellRendererComponent
          */
-	public Component getListCellRendererComponent(Component list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+	public Component getListCellRendererComponent(Component listOrTable, Object value, int index, boolean isSelected, boolean cellHasFocus) {
             setValue(value);
-            setupState(list, isSelected, cellHasFocus);
+            setupState(listOrTable, isSelected, cellHasFocus);
+
+            listOrTable.setState(getCurrentState());
+            setForeground(listOrTable.getForeground());
+            listOrTable.setState(-1);
+
             return this;
 	}
 

Modified: SwingME/src/net/yura/mobile/gui/cellrenderer/ListCellRenderer.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/cellrenderer/ListCellRenderer.java	2021-02-24 12:28:13 UTC (rev 2399)
+++ SwingME/src/net/yura/mobile/gui/cellrenderer/ListCellRenderer.java	2021-02-24 16:13:40 UTC (rev 2400)
@@ -34,7 +34,7 @@
      * @return A component whose paint() method will render the specified value
      * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) ListCellRenderer.getListCellRendererComponent
      */
-    Component getListCellRendererComponent(Component list, Object value, int index, boolean isSelected, boolean cellHasFocus);
+    Component getListCellRendererComponent(Component listOrTable, Object value, int index, boolean isSelected, boolean cellHasFocus);
 
     void updateUI();
 

Modified: SwingME/src/net/yura/mobile/gui/components/Component.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Component.java	2021-02-24 12:28:13 UTC (rev 2399)
+++ SwingME/src/net/yura/mobile/gui/components/Component.java	2021-02-24 16:13:40 UTC (rev 2400)
@@ -434,12 +434,14 @@
 
     /**
      * @see java.awt.Component#getForeground() Component.getForeground
+     * @see javax.swing.JList#getSelectionForeground() JList.getSelectionForeground
+     * @see javax.swing.JTable#getSelectionForeground() JTable.getSelectionForeground
      */
     public final int getForeground() {
         if (foreground!=Style.NO_COLOR) {
             return foreground;
         }
-        int f = theme.getForeground( getCurrentState() );
+        int f = theme.getForeground(getCurrentState());
         if (f!=Style.NO_COLOR || parent==null) {
             return f;
         }

Modified: SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java	2021-02-24 12:28:13 UTC (rev 2399)
+++ SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java	2021-02-24 16:13:40 UTC (rev 2400)
@@ -289,12 +289,12 @@
             setUIDefault(componentName+".background", noColor);
             setUIDefault(componentName+".border", tmp1);
             setUIDefault(componentName+"[selected].border",tmp2);
-            setUIDefault(componentName+"[selected].foreground",uiSettings.get("nimbusSelectedText"));
-            setUIDefault(componentName+"[disabled].foreground",uiSettings.get("nimbusDisabledText"));
             setUIDefault(componentName+"[focused].border",tmp3);
             setUIDefault(componentName+"[focused+selected].border",tmp4);
         }
 
+        setUIDefault("List[selected].foreground",uiSettings.get("nimbusSelectedText"));
+        setUIDefault("List[disabled].foreground",uiSettings.get("nimbusDisabledText"));
         setUIDefault("List.background", uiSettings.get("nimbusLightBackground") );
 
         componentName = "MenuRenderer";

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.