[Fudaa-svn-commit] SF.net SVN: fudaa:[8428] trunk/framework

[<de...@us...>]

Revision: 8428
          http://sourceforge.net/p/fudaa/svn/8428
Author:   deniger
Date:     2013-06-28 06:08:06 +0000 (Fri, 28 Jun 2013)
Log Message:
-----------
correction bug divers

Modified Paths:
--------------
    trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTreeComboboxRenderer.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZEbliCalquesPanel.java

Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTreeComboboxRenderer.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTreeComboboxRenderer.java	2013-06-28 06:07:56 UTC (rev 8427)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTreeComboboxRenderer.java	2013-06-28 06:08:06 UTC (rev 8428)
@@ -7,8 +7,11 @@
  */
 package org.fudaa.ctulu.gui;
 
+import com.memoire.bu.BuGridLayout;
+import java.awt.Color;
 import java.awt.Component;
 import java.awt.FlowLayout;
+import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JList;
 import javax.swing.JPanel;
@@ -34,7 +37,7 @@
     tree_ = new JTree();
     this.treeModel_ = _treeModel;
     this.treeRenderer_ = _treeRenderer;
-    setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
+    setLayout(new BuGridLayout(1, 0, 0, true, true));
     setBorder(indentBorder_);
     setOpaque(true);
   }
@@ -53,12 +56,11 @@
   }
 
   protected void update(final JList _l, final JComponent _treeRender, final boolean _isSelected, final Object _value) {
-
   }
 
   @Override
   public Component getListCellRendererComponent(final JList _list, final Object _value, final int _index,
-      final boolean _isSelected, final boolean _cellHasFocus) {
+          final boolean _isSelected, final boolean _cellHasFocus) {
     if (_value == null) { // if selected value is null
       removeAll();
       return this;
@@ -69,14 +71,14 @@
     final boolean hasFocus = isSelectable && _cellHasFocus;
     final boolean isSelected = isSelectable && _isSelected;
     final Component comp = treeRenderer_.getTreeCellRendererComponent(tree_, _value, isSelected, true, leaf, _index,
-        hasFocus);
+            hasFocus);
     removeAll();
-    // comp.setBackground(UIManager.getColor("ComboBox.background"));
-    add(comp);
     ((JComponent) comp).setAlignmentY(0.5f);
     ((JComponent) comp).setOpaque(false);
     ((JComponent) comp).setFont(_list.getFont());
-    if (isSelected) {
+    add(comp);
+    revalidate();
+    if (isSelected && _index >= 0) {
       setBackground(_list.getSelectionBackground());
       ((JComponent) comp).setForeground(_list.getSelectionForeground());
     } else {

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZEbliCalquesPanel.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZEbliCalquesPanel.java	2013-06-28 06:07:56 UTC (rev 8427)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZEbliCalquesPanel.java	2013-06-28 06:08:06 UTC (rev 8428)
@@ -946,6 +946,7 @@
         }
         if (_isSelected && !EbliFindDialog.isCalqueFindable(_value)) {
           setBackground(_l.getBackground());
+          _comp.setBackground(_l.getBackground());
           _comp.setForeground(_l.getForeground());
           setToolTipText(EbliLib.getS("Recherche inactive"));
         }

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