RESOLVED - bug 357041: Manually set cell text does not become disabled

https://bugs.eclipse.org/bugs/show_bug.cgi?id=357041
contributed from Remo Arpagaus

3 files changed, 17 insertions, 5 deletions

diff --git a/org.eclipse.scout.rt.ui.swing/Release Notes.txt b/org.eclipse.scout.rt.ui.swing/Release Notes.txt
index 50d0bf8673..837d57fc3d 100644
--- a/org.eclipse.scout.rt.ui.swing/Release Notes.txt
+++ b/org.eclipse.scout.rt.ui.swing/Release Notes.txt
@@ -200,4 +200,12 @@ Plug-Ins changed:
 - org.eclipse.scout.rt.ui.swt

 - org.eclipse.scout.rt.ui.swing

 Migration:

-None
\ No newline at end of file
+None

+

+07.09.2011 rar

+BSI ticket #99'210

+Problem:

+The foreground color of JLabels which are disabled and contain HTML are not correclty greyed out. See: http://stackoverflow.com/questions/2242542/jlabel-not-greyed-out-when-disabled-when-html-text-displayed/

+Solution:

+Set the foreground color direclty using the color declared in the UIDefaults "TextField.inactiveForeground"

+Migration: None

diff --git a/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/basic/table/SwingScoutTable.java b/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/basic/table/SwingScoutTable.java
index b766c092e4..2499d2dc54 100644
--- a/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/basic/table/SwingScoutTable.java
+++ b/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/basic/table/SwingScoutTable.java
@@ -1167,7 +1167,7 @@ public class SwingScoutTable extends SwingScoutComposite<ITable> implements ISwi
           if (c instanceof JLabel) {

             ((JLabel) c).setText(text);

             if (m_htmlViewCache != null) {

-              m_htmlViewCache.updateHtmlView((JLabel) c);

+              m_htmlViewCache.updateHtmlView((JLabel) c, cell.getForegroundColor() != null);

             }

           }

           // tooltip

diff --git a/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/ext/HtmlViewCache.java b/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/ext/HtmlViewCache.java
index 703c3655c0..9ead673e72 100644
--- a/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/ext/HtmlViewCache.java
+++ b/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/ext/HtmlViewCache.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- * 

+ *

  * Contributors:

  *     BSI Business Systems Integration AG - initial API and implementation

  ******************************************************************************/

@@ -15,6 +15,7 @@ import java.util.HashMap;
 import java.util.zip.Adler32;

 

 import javax.swing.JLabel;

+import javax.swing.UIManager;

 import javax.swing.plaf.basic.BasicHTML;

 import javax.swing.text.View;

 

@@ -38,10 +39,14 @@ public class HtmlViewCache {
   /**

    * update html view using the cache

    */

-  public void updateHtmlView(JLabel label) {

+  public void updateHtmlView(JLabel label, boolean customForeground) {

     String text = label.getText();

     View value = null;

     if (BasicHTML.isHTMLString(text)) {

+      if (!customForeground) {

+        label.setForeground(label.isEnabled() ? UIManager.getDefaults().getColor("TextField.foreground") : UIManager.getDefaults().getColor("TextField.inactiveForeground"));

+      }

+

       Adler32 crc = new Adler32();

       crc.update(text.getBytes());

       Color fg = label.getForeground();

@@ -56,5 +61,4 @@ public class HtmlViewCache {
     }

     label.putClientProperty(BasicHTML.propertyKey, value);

   }

-

 }