Bug 267831, add a resizer between the url and search fields, r=mano

browser/base/content/browser.xul

@@ -201,7 +201,7 @@
                      ondragexit="nsDragAndDrop.dragExit(event, homeButtonObserver);"
                      onclick="BrowserHomeClick(event);"/>
 
-      <toolbaritem id="urlbar-container" align="center" flex="400"
+      <toolbaritem id="urlbar-container" align="center" flex="400" persist="width"
                    title="&locationItem.title;" class="chromeclass-location">
         <hbox id="urlbar-button-box" flex="1">
             <textbox id="urlbar" flex="1"
@@ -286,7 +286,7 @@
 
       <toolbaritem id="search-container" title="&searchItem.title;" 
                    align="center" class="chromeclass-toolbar-additional"
-                   flex="100">
+                   flex="100" persist="width">
         <searchbar id="searchbar" flex="1" chromedir="&locale.dir;"/>
       </toolbaritem>
 
@@ -366,9 +366,9 @@
              fullscreentoolbar="true" mode="icons" 
              customizable="true"
 #ifdef XP_MACOSX
-             defaultset="back-button,forward-button,reload-button,stop-button,home-button,urlbar-container,go-container,search-container,throbber-box"
+             defaultset="back-button,forward-button,reload-button,stop-button,home-button,urlbar-container,go-container,splitter,search-container,throbber-box"
 #else
-             defaultset="back-button,forward-button,reload-button,stop-button,home-button,urlbar-container,go-container,search-container,fullscreenflex,window-controls"
+             defaultset="back-button,forward-button,reload-button,stop-button,home-button,urlbar-container,go-container,splitter,search-container,fullscreenflex,window-controls"
 #endif
              context="toolbar-context-menu">
 #ifndef XP_MACOSX

toolkit/content/customizeToolbar.js

@@ -339,6 +339,12 @@ function buildPalette()
   templateNode.flex = 1;
   wrapPaletteItem(templateNode, currentRow, null);
 
+  // Add the splitter item.
+  templateNode = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
+                                          "splitter");
+  templateNode.id = "splitter";
+  wrapPaletteItem(templateNode, currentRow, null);
+
   var rowSlot = 3;
 
   var currentItems = getCurrentItemIds();
@@ -480,6 +486,8 @@ function setWrapperType(aItem, aWrapper)
     aWrapper.setAttribute("type", "spring");
   } else if (aItem.localName == "toolbarspacer") {
     aWrapper.setAttribute("type", "spacer");
+  } else if (aItem.localName == "splitter") {
+    aWrapper.setAttribute("type", "splitter");
   } else if (aItem.localName == "toolbaritem" && aItem.firstChild) {
     aWrapper.setAttribute("type", aItem.firstChild.localName);
   }
@@ -698,7 +706,8 @@ function isSpecialItem(aElt)
 {
   return aElt.localName == "toolbarseparator" ||
          aElt.localName == "toolbarspring" ||
-         aElt.localName == "toolbarspacer";
+         aElt.localName == "toolbarspacer" ||
+         aElt.localName == "splitter";
 }
 
 function isToolbarItem(aElt)
@@ -707,7 +716,8 @@ function isToolbarItem(aElt)
          aElt.localName == "toolbaritem" ||
          aElt.localName == "toolbarseparator" ||
          aElt.localName == "toolbarspring" ||
-         aElt.localName == "toolbarspacer";
+         aElt.localName == "toolbarspacer" ||
+         aElt.localName == "splitter";
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -866,7 +876,8 @@ var toolbarDNDObserver =
       var currentRow = draggedPaletteWrapper.parentNode;
       if (draggedItemId != "separator" &&
           draggedItemId != "spring" &&
-          draggedItemId != "spacer")
+          draggedItemId != "spacer" &&
+          draggedItemId != "splitter")
       {
         currentRow.removeChild(draggedPaletteWrapper);
 
@@ -948,7 +959,10 @@ var paletteDNDObserver =
       wrapper.parentNode.removeChild(wrapper);
       
       var wrapperType = wrapper.getAttribute("type");
-      if (wrapperType != "separator" && wrapperType != "spacer" && wrapperType != "spring") {
+      if (wrapperType != "separator" &&
+          wrapperType != "spacer" &&
+          wrapperType != "spring" &&
+          wrapperType != "splitter") {
         // Find the template node in the toolbox palette
         var templateNode = gToolbox.palette.firstChild;
         while (templateNode) {

toolkit/content/widgets/toolbar.xml

@@ -133,7 +133,8 @@
                   node.localName == "toolbarbutton" ||
                   node.localName == "toolbarseparator" ||
                   node.localName == "toolbarspring" ||
-                  node.localName == "toolbarspacer")
+                  node.localName == "toolbarspacer" ||
+                  node.localName == "splitter")
               {
                 if (currentSet)
                   currentSet += ",";
@@ -144,6 +145,8 @@
                   currentSet += "spring";
                 else if (node.localName == "toolbarspacer")
                   currentSet += "spacer";
+                else if (node.localName == "splitter")
+                  currentSet += "splitter";
                 else
                   currentSet += node.id;
               }
@@ -219,6 +222,11 @@
                                                  "toolbarspacer");
               uniqueId = (new Date()).getTime()+this.childNodes.length;
               newItem.id = "spacer" + uniqueId;
+            } else if (aId == "splitter") {
+              newItem = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
+                                                 "splitter");
+              uniqueId = (new Date()).getTime()+this.childNodes.length;
+              newItem.id = "splitter" + uniqueId;
             } else if (this.parentNode.localName == "toolbox") {
               // Attempt to locate an item with a matching id within palette.
               var paletteItem = this.parentNode.palette.firstChild;

toolkit/locales/en-US/chrome/global/customizeToolbar.properties

@@ -5,3 +5,4 @@ enterToolbarBlank=You must enter a name to create a new toolbar.
 separatorTitle=Separator
 springTitle=Flexible Space
 spacerTitle=Space
+splitterTitle=Resizer

toolkit/themes/gnomestripe/global/toolbar.css

@@ -129,6 +129,11 @@ toolbarpaletteitem[place="toolbar"] > toolbarspacer {
   height: 50px;
 }
 
+.toolbarpaletteitem-box[type="splitter"][place="palette"] {
+  width: 8px;
+  height: 50px;
+}
+
 .toolbarpaletteitem-box[type="spacer"][place="palette"],
 .toolbarpaletteitem-box[type="spring"][place="palette"] {
   margin-bottom: 2px;

toolkit/themes/pinstripe/global/toolbar.css

@@ -145,6 +145,11 @@ toolbarpaletteitem[type="spacer"] {
   height: 50px;
 }
 
+.toolbarpaletteitem-box[type="splitter"][place="palette"] {
+  width: 8px;
+  height: 50px;
+}
+
 .toolbarpaletteitem-box[type="spacer"][place="palette"],
 .toolbarpaletteitem-box[type="spring"][place="palette"] {
   margin-bottom: 2px;

toolkit/themes/pmstripe/global/toolbar.css

@@ -140,6 +140,11 @@ toolbarpaletteitem[place="toolbar"] > toolbarspacer {
   height: 50px;
 }
 
+.toolbarpaletteitem-box[type="splitter"][place="palette"] {
+  width: 8px;
+  height: 50px;
+}
+
 .toolbarpaletteitem-box[type="spacer"][place="palette"],
 .toolbarpaletteitem-box[type="spring"][place="palette"] {
   margin-bottom: 2px;

toolkit/themes/winstripe/global/toolbar.css

@@ -132,6 +132,11 @@ toolbarpaletteitem[place="toolbar"] > toolbarspacer {
   height: 50px;
 }
 
+.toolbarpaletteitem-box[type="splitter"][place="palette"] {
+  width: 8px;
+  height: 50px;
+}
+
 .toolbarpaletteitem-box[type="spacer"][place="palette"],
 .toolbarpaletteitem-box[type="spring"][place="palette"] {
   margin-bottom: 2px;