[Fudaa-svn-commit] SF.net SVN: fudaa:[4294] branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ ebli

[<had...@us...>]

Revision: 4294
          http://fudaa.svn.sourceforge.net/fudaa/?rev=4294&view=rev
Author:   hadouxad
Date:     2008-12-11 09:14:38 +0000 (Thu, 11 Dec 2008)

Log Message:
-----------
r?\195?\169solution bug 8b

Modified Paths:
--------------
    branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/controle/BSelecteurListComboBox.java
    branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java

Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/controle/BSelecteurListComboBox.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/controle/BSelecteurListComboBox.java	2008-12-10 23:38:37 UTC (rev 4293)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/controle/BSelecteurListComboBox.java	2008-12-11 09:14:38 UTC (rev 4294)
@@ -7,6 +7,8 @@
  */
 package org.fudaa.ebli.controle;
 
+import java.awt.Dimension;
+
 import javax.swing.JComponent;
 import javax.swing.ListModel;
 import javax.swing.ListSelectionModel;
@@ -81,19 +83,32 @@
   public boolean isUpdatingFromSrc_;
 
   public BSelecteurListComboBox() {
-    setLayout(new BuBorderLayout());
-    cb_ = new BuComboBox();
-    adapter_ = new CtuluComboBoxModelAdapter(CtuluListModelEmpty.EMPTY);
-    cb_.setModel(adapter_);
-    cbListener_ = new CbDataListener();
-    listSelectionListener_ = new TargetSelectionListener();
-    adapter_.addListDataListener(cbListener_);
-    cb_.setEnabled(false);
-    add(cb_, BuBorderLayout.CENTER);
+   this(null);
     
 
   }
+  
+  public BSelecteurListComboBox(Dimension sizeCombo) {
+	    setLayout(new BuBorderLayout());
+	    cb_ = new BuComboBox();
+	    adapter_ = new CtuluComboBoxModelAdapter(CtuluListModelEmpty.EMPTY);
+	    cb_.setModel(adapter_);
+	    cbListener_ = new CbDataListener();
+	    listSelectionListener_ = new TargetSelectionListener();
+	    adapter_.addListDataListener(cbListener_);
+	    cb_.setEnabled(false);
+	    
+	    if(sizeCombo!=null){
+	    	cb_.setMinimumSize(sizeCombo);
+	        cb_.setMaximumSize(sizeCombo);
+	        cb_.setSize(sizeCombo);
+	    }
+	    add(cb_, BuBorderLayout.CENTER);
+	    
 
+	  }
+  
+
   boolean isTargetUpdatable() {
     return target_ != null && target_.getListSelectionModel() != null;
   }

Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java	2008-12-10 23:38:37 UTC (rev 4293)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java	2008-12-11 09:14:38 UTC (rev 4294)
@@ -1,5 +1,6 @@
 package org.fudaa.ebli.visuallibrary.calque;
 
+import java.awt.Dimension;
 import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -508,13 +509,19 @@
       comboVar_ = new BSelecteurListComboBox();
       // pour mettre \xE0 jour la combo d\xE8s que la s\xE9lection de l'arbre change
       majComboVar();
-      // combo.setPalettePanelTarget(listselector.getTarget());
-      comboVar_.setMinimumSize(comboVar_.getPreferredSize());
-      comboVar_.setMaximumSize(comboVar_.getPreferredSize());
 
       // ajout combobox
       toolbarCalque_.add(comboVar_);
-
+     
+      comboVar_.setPreferredSize(new Dimension(Math.max(comboVar_.getPreferredSize().width,200),comboVar_.getPreferredSize().height));
+      comboVar_.getCb().setMaximumSize(new Dimension(Math.max(comboVar_.getPreferredSize().width,200),comboVar_.getPreferredSize().height));
+      comboVar_.getCb().setMinimumSize(new Dimension(Math.max(comboVar_.getPreferredSize().width,200),comboVar_.getPreferredSize().height));
+      comboVar_.getCb().setSize(new Dimension(Math.max(comboVar_.getPreferredSize().width,200),comboVar_.getPreferredSize().height));
+      comboVar_.getCb().setPreferredSize(new Dimension(Math.max(comboVar_.getPreferredSize().width,200),comboVar_.getPreferredSize().height));
+      
+      comboVar_.revalidate();
+      toolbarCalque_.revalidate();
+      
       // -- ajout des combo des pas de temps --//
       final EbliCalqueActionTimeChooser chooserT = new EbliCalqueActionTimeChooser(getVisuPanel().getArbreCalqueModel()
           .getTreeSelectionModel(), true);
@@ -522,12 +529,16 @@
       chooserT.setSelected(true);
       final BSelecteurListComboBox combo = (BSelecteurListComboBox) chooserT.buildContentPane();
       chooserT.updateBeforeShow();
-      combo.setMaximumSize(combo.getPreferredSize());
-      combo.setMinimumSize(combo.getPreferredSize());
-
+     
       // ajout combobox
       toolbarCalque_.add(combo);
-
+      combo.setPreferredSize(new Dimension(Math.max(comboVar_.getPreferredSize().width,200),comboVar_.getPreferredSize().height));
+      combo.getCb().setMaximumSize(new Dimension(Math.max(comboVar_.getPreferredSize().width,200),comboVar_.getPreferredSize().height));
+      combo.getCb().setMinimumSize(new Dimension(Math.max(comboVar_.getPreferredSize().width,200),comboVar_.getPreferredSize().height));
+      combo.getCb().setSize(new Dimension(Math.max(comboVar_.getPreferredSize().width,200),comboVar_.getPreferredSize().height));
+      combo.getCb().setPreferredSize(new Dimension(Math.max(comboVar_.getPreferredSize().width,200),comboVar_.getPreferredSize().height));
+      combo.revalidate();
+      toolbarCalque_.revalidate();
     }
     // -- mise a jour de la combo de variables pour le cas ou l on ajoute des
     // var dans editer les var


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