Changeset 15066

Timestamp:

03/06/10 21:57:23 (2 years ago)

Author:

sys

Message:

améliorations maximizeBoxes

Location:

trunk/Xul_Wsp/content

Files:

• scenariCms/util/scmaxblock.js (modified) (1 diff)
• scenariWsp/desks/wspDesk/wspDesk.xul (modified) (1 diff)
• scenariWsp/windows/itemSelector/selItem.js (modified) (1 diff)
• scenariWsp/windows/itemSelector/selItem.xul (modified) (1 diff)

trunk/Xul_Wsp/content/scenariCms/util/scmaxblock.js

@@ -80 +80 @@
                         while(vCh){
                                 if(vCh != vCurrChild) {
-                                        var vCs = vWin.getComputedStyle(vCh, null);
-                                        if( vCs.display!="none" && vCs.visibility!="collapse"){
-                                                //log.debug("vParent=\n"+dom.getXml(vCurrRoot)+"\n\nvCurrChild=\n"+dom.getXml(vCurrChild)+"\n\nCollapsed=\n"+dom.getXml(vCh));
-                                                vCh.collapsed = true;
-                                                pArray.push(vCh);
+                                        if(vCh.getAttribute("whenMaxOtherBox")!="visible") {
+                                                var vCs = vWin.getComputedStyle(vCh, null);
+                                                if( vCs.display!="none" && vCs.visibility!="collapse"){
+                                                        //log.debug("vParent=\n"+dom.getXml(vCurrRoot)+"\n\nvCurrChild=\n"+dom.getXml(vCurrChild)+"\n\nCollapsed=\n"+dom.getXml(vCh));
+                                                        vCh.collapsed = true;
+                                                        pArray.push(vCh);
+                                                }
                                         }
                                 }

trunk/Xul_Wsp/content/scenariWsp/desks/wspDesk/wspDesk.xul

@@ -107 +107 @@
         </toolbox>
         <matrix id="matrix" orient="horizontal"/>
-        <statusbar id="statusbar">
+        <statusbar id="statusbar" whenMaxOtherBox="visible">
                 <statusbarpanel id="statusbarInfo" flex="1"/>
         </statusbar>

trunk/Xul_Wsp/content/scenariWsp/windows/itemSelector/selItem.js

@@ -82 +82 @@
                 
                 //onload : Gestion de la fonction de maximisation d'un block.
-                extPoints.addToList("event:load:wspDesk", "scMaxBlock", 1, function(){
+                extPoints.addToList("event:load:selItem", "scMaxBlock", 1, function(){
                         document.addEventListener(SCMAXIMIZEBLOCK_EVENT, scMaxBlockOnMaximize, false);
                         document.addEventListener(SCNORMALIZEBLOCK_EVENT, scMaxBlockOnNormalize, false);

trunk/Xul_Wsp/content/scenariWsp/windows/itemSelector/selItem.xul

@@ -62 +62 @@
         <matrix id="matrix" orient="horizontal"/>
         
-        <hbox id="btnsBar" align="center">
+        <hbox id="btnsBar" align="center" whenMaxOtherBox="visible">
                 <hbox id="itemViewBox" align="center">
                         <text id="itemViewLabel" value="Item sélectionné : "/>