From 784fee757ab07c6485de2c75165203629e2bf386 Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Thu, 1 Feb 2007 15:15:06 +0000
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=89=B2=E3=81=95=E3=82=8C=E3=81=9F?=
 =?UTF-8?q?=E3=83=96=E3=83=A9=E3=82=A6=E3=82=B6=E3=82=92=E3=81=9F=E3=81=9F?=
 =?UTF-8?q?=E3=82=80=E3=83=BB=E3=81=B2=E3=82=8D=E3=81=92=E3=82=8B=E5=87=A6?=
 =?UTF-8?q?=E7=90=86=E3=82=92=E6=9B=B8=E3=81=8D=E7=9B=B4=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://www.cozmixng.org/repos/piro/splitbrowser/trunk@117 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/splitbrowser/splitbrowser.css |  11 +-
 content/splitbrowser/splitbrowser.js  | 156 +++++----
 content/splitbrowser/splitbrowser.xml | 477 ++++++++++++++++++++------
 3 files changed, 478 insertions(+), 166 deletions(-)

diff --git a/content/splitbrowser/splitbrowser.css b/content/splitbrowser/splitbrowser.css
index 410e025..4446e70 100644
--- a/content/splitbrowser/splitbrowser.css
+++ b/content/splitbrowser/splitbrowser.css
@@ -10,7 +10,7 @@
 }
 
 #appcontent > vbox > hbox > .primary-browser-wrapper {
-	-moz-binding: url("./splitbrowser.xml#subbrowser-base") !important;
+	-moz-binding: url("./splitbrowser.xml#subbrowser-primary") !important;
 }
 
 subbrowser-container {
@@ -21,6 +21,15 @@ subbrowser {
 	-moz-binding: url("./splitbrowser.xml#subbrowser") !important;
 }
 
+vbox.vertical-container > hbox.horizontal-container {
+	-moz-binding: url("./splitbrowser.xml#horizontal-container") !important;
+}
+
+vbox.vertical-container {
+	-moz-binding: url("./splitbrowser.xml#vertical-container") !important;
+}
+
+
 
 /* tabbed browsing mode / simple mode */
 
diff --git a/content/splitbrowser/splitbrowser.js b/content/splitbrowser/splitbrowser.js
index b513bdb..fddc62d 100644
--- a/content/splitbrowser/splitbrowser.js
+++ b/content/splitbrowser/splitbrowser.js
@@ -46,6 +46,14 @@ var SplitBrowser = {
 		return document.getElementById('splitbrowser-expandAll-broadcaster');
 	},
 	updateBroadcasters : function()
+	{
+		if (this.updateBroadcastersTimer) {
+			window.clearTimeout(this.updateBroadcastersTimer);
+			this.updateBroadcastersTimer = null;
+		}
+		this.updateBroadcastersTimer = window.setTimeout('SplitBrowser.updateBroadcastersCallback();', 1);
+	},
+	updateBroadcastersCallback : function()
 	{
 		if (!this.browsers.length) {
 			this.removeAllBroadcaster.setAttribute('disabled', true);
@@ -66,7 +74,6 @@ var SplitBrowser = {
 
 				if (collapsed && expanded) break;
 			}
-
 			if (collapsed)
 				this.expandAllBroadcaster.removeAttribute('disabled');
 			else
@@ -77,6 +84,8 @@ var SplitBrowser = {
 			else
 				this.collapseAllBroadcaster.setAttribute('disabled', true);
 		}
+
+		this.updateBroadcastersTimer = null;
 	},
  
 	POSITION_LEFT   : 1, 
@@ -465,15 +474,19 @@ var SplitBrowser = {
 				if (cont.previousSibling &&
 					cont.previousSibling.localName == 'splitter') {
 					box = cont.previousSibling.previousSibling;
-					box.height = box.boxObject.height + cont.boxObject.height;
-					cont.previousSibling.previousSibling.removeAttribute('collapsed');
+					if (box) {
+						box.height = box.boxObject.height + cont.boxObject.height;
+						box.removeAttribute('collapsed');
+					}
 					container.vContainer.removeChild(cont.previousSibling);
 				}
 				else if (cont.nextSibling &&
 					cont.nextSibling.localName == 'splitter') {
 					box = cont.nextSibling.nextSibling;
-					box.height = box.boxObject.height + cont.boxObject.height;
-					cont.nextSibling.nextSibling.removeAttribute('collapsed');
+					if (box) {
+						box.height = box.boxObject.height + cont.boxObject.height;
+						box.removeAttribute('collapsed');
+					}
 					container.vContainer.removeChild(cont.nextSibling);
 				}
 				container.vContainer.removeChild(cont);
@@ -504,14 +517,18 @@ var SplitBrowser = {
 			var box;
 			if (container.previousSibling && container.previousSibling.localName == 'splitter') {
 				box = container.previousSibling.previousSibling;
-				box.width = box.boxObject.width + container.boxObject.width;
-				container.previousSibling.previousSibling.removeAttribute('collapsed');
+				if (box) {
+					box.width = box.boxObject.width + container.boxObject.width;
+					box.removeAttribute('collapsed');
+				}
 				container.parentNode.removeChild(container.previousSibling);
 			}
 			else if (container.nextSibling && container.nextSibling.localName == 'splitter') {
 				box = container.nextSibling.nextSibling;
-				box.width = box.boxObject.width + container.boxObject.width;
-				container.nextSibling.nextSibling.removeAttribute('collapsed');
+				if (box) {
+					box.width = box.boxObject.width + container.boxObject.width;
+					box.removeAttribute('collapsed');
+				}
 				container.parentNode.removeChild(container.nextSibling);
 			}
 			container.parentNode.removeChild(container);
@@ -553,16 +570,16 @@ var SplitBrowser = {
 		for (var i = 0, maxi = this.browsers.length; i < maxi; i++)
 		{
 			if (!this.browsers[i].contentCollapsed)
-				this.browsers[i].toggleCollapsed(this.browsers[i].FORCE_COLLAPSE);
+				this.browsers[i].collapse();
 		}
 	},
  
 	expandAllSubBrowsers : function()
 	{
-		for (var i = this.browsers.length -1; i > -1; i--)
+		for (var i = 0, maxi = this.browsers.length; i < maxi; i++)
 		{
 			if (this.browsers[i].contentCollapsed)
-				this.browsers[i].toggleCollapsed(this.browsers[i].FORCE_EXPAND);
+				this.browsers[i].expand(true);
 		}
 	},
   
@@ -576,9 +593,8 @@ var SplitBrowser = {
 	
 	getContainerState : function(aContainer) 
 	{
-		var state = {
-				children : []
-			};
+		var state = {};
+		state.children = [];
 
 		var hContainer = aContainer.hContainer;
 		if (hContainer) {
@@ -606,7 +622,9 @@ var SplitBrowser = {
 				};
 			}
 			else {
-				state.content = this.getContainerState(originalContent);
+				state.children.push(this.getContainerState(originalContent));
+				state.children[state.children.length-1].position = this.POSITION_RIGHT;
+				state.children[state.children.length-1].width    = originalContent.boxObject.width;
 			}
 
 			var node = originalContent.previousSibling;
@@ -658,7 +676,9 @@ var SplitBrowser = {
 			state.content.lastHeight = aContainer.lastheight;
 		}
 		else if (!state.content) {
-			state.content = this.getContainerState(originalContent);
+			state.children.push(this.getContainerState(originalContent));
+			state.children[state.children.length-1].position = this.POSITION_BOTTOM;
+			state.children[state.children.length-1].height   = originalContent.boxObject.height;
 		}
 
 		var node = originalContent.previousSibling;
@@ -819,6 +839,7 @@ var SplitBrowser = {
 			eval('state = '+state);
 		}
 		catch(e) {
+alert(e+'\n\n'+state);
 			return;
 		}
 
@@ -827,41 +848,52 @@ var SplitBrowser = {
 	
 	buildContent : function(aState, aContainer) 
 	{
-		switch (aState.content.type)
-		{
-			case 'root':
-				aContainer.contentWrapper.width  = aState.content.width;
-				aContainer.contentWrapper.height = aState.content.height;
-				break;
-
-			default:
-			case 'subbrowser':
-				if (aState.content.history) {
-					aState.content.histories = [aState.content.history];
-				}
+		var content;
+		if (aState.content && aState.content.type) {
+			switch (aState.content.type)
+			{
+				case 'root':
+					aContainer.contentWrapper.width  = aState.content.width;
+					aContainer.contentWrapper.height = aState.content.height;
+					content = aContainer.contentWrapper;
+					break;
 
-				var b = this.createSubBrowser(
-						aState.content.histories && aState.content.histories.length ? null : aState.content.uri
-					);
-				aContainer.hContainer.appendChild(b);
-				aContainer.hContainer.width  = aState.content.width;
-				aContainer.hContainer.height = aState.content.height;
+				case 'subbrowser':
+					if (aState.content.history) {
+						aState.content.histories = [aState.content.history];
+					}
 
-				this.deserializeBrowserState(b.browser, aState.content);
+					var b = this.createSubBrowser(
+							aState.content.histories && aState.content.histories.length ? null : aState.content.uri
+						);
+					aContainer.hContainer.appendChild(b);
+					aContainer.hContainer.width  = aState.content.width;
+					aContainer.hContainer.height = aState.content.height;
+
+					this.deserializeBrowserState(b.browser, aState.content);
+
+					aContainer.lastwidth  = aState.content.lastWidth;
+					aContainer.lastheight = aState.content.lastHeight;
+	/*
+					if (aState.content.collapsed) {
+						if (aState.position & this.POSITION_HORIZONTAL)
+							aContainer.setAttribute('maxwidth', 0);
+						else
+							aContainer.setAttribute('maxheight', 0);
+					}
+	*/
 
-				aContainer.lastwidth  = aState.content.lastWidth;
-				aContainer.lastheight = aState.content.lastHeight;
-/*
-				if (aState.content.collapsed) {
-					aContainer.contentCollapsed = true;
-					if (aState.position & this.POSITION_HORIZONTAL)
-						aContainer.setAttribute('maxwidth', 0);
-					else
-						aContainer.setAttribute('maxheight', 0);
-				}
-*/
+					content = b;
+					break;
 
-				break;
+				default:
+					break;
+			}
+		}
+		if (!content) {
+			content = document.createElement('spacer');
+			content.setAttribute('flex', 1);
+			aContainer.hContainer.appendChild(content);
 		}
 
 		var container;
@@ -872,7 +904,7 @@ var SplitBrowser = {
 			container = this.addContainerTo(
 				aContainer,
 				aState.children[i].position,
-				null,
+				content,
 				aState.children[i].width,
 				aState.children[i].height
 			);
@@ -881,8 +913,13 @@ var SplitBrowser = {
 			this.buildContent(aState.children[i], container);
 		}
 
-		if (!aContainer.hContainer.hasChildNodes()) {
-			aContainer.vContainer.removeChild(aContainer.hContainer);
+		if (content && content.localName == 'spacer') {
+			if (content.nextSibling)
+				aContainer.hContainer.removeChild(content.nextSibling);
+			else if (content.previousSibling)
+				aContainer.hContainer.removeChild(content.previousSibling);
+			aContainer.hContainer.removeChild(content);
+			this.cleanUpContainer(aContainer);
 		}
 	},
  
@@ -1239,10 +1276,10 @@ catch(e) {
 	updateSplitterSideBoxes : function(aEvent, aProp) 
 	{
 		var splitter = aEvent.originalTarget || aEvent.target;
-		this.updateSplitterSideBox(splitter.previousSibling, aEvent, aProp);
-		this.updateSplitterSideBox(splitter.nextSibling, aEvent, aProp);
+		this.updateSplitterSideBox(splitter, splitter.previousSibling, aEvent, aProp);
+		this.updateSplitterSideBox(splitter, splitter.nextSibling, aEvent, aProp);
 	},
-	updateSplitterSideBox : function(aNode, aEvent, aProp)
+	updateSplitterSideBox : function(aSplitter, aNode, aEvent, aProp)
 	{
 		if (aEvent.type == 'mousedown') {
 			aNode.splitterDragging = true;
@@ -1252,11 +1289,11 @@ catch(e) {
 			else {
 				aNode['tempLast'+aProp] = -1;
 			}
-			aNode.contentCollapsed = false;
 			aNode.removeAttribute('max'+aProp);
 		}
 		else {
-			if (aNode.contentCollapsed &&
+			var cCProp = aProp == 'width' ? 'hContentCompletelyCollapsed' : 'vContentCompletelyCollapsed' ;
+			if (aNode[cCProp] &&
 				aNode['tempLast'+aProp] !== void(0) &&
 				aNode['tempLast'+aProp] > -1 &&
 				(
@@ -1265,7 +1302,6 @@ catch(e) {
 				)
 				) {
 				aNode['last'+aProp] = aNode['tempLast'+aProp];
-				aNode.contentCollapsed = true;
 				aNode.setAttribute('max'+aProp, 0);
 			}
 			aNode['tempLast'+aProp] = -1;
@@ -1273,12 +1309,16 @@ catch(e) {
 				aNode.splitterDragging = false;
 			}, 0);
 		}
+
+		for (var i = 0, maxi = aNode.childNodes.length; i < maxi; i = i+2)
+		{
+			this.updateSplitterSideBox(aSplitter, aNode.childNodes[i], aEvent, aProp);
+		}
 	},
  
 	updateSplitterContextMenu : function() 
 	{
 		var c = this.getSplitterTarget(document.popupNode);
-		alert(c);
 		if (!c) return;
 
 		var popup = document.getElementById('subbrowser-splitter-contextmenu');
diff --git a/content/splitbrowser/splitbrowser.xml b/content/splitbrowser/splitbrowser.xml
index b2f1bb1..c0f8ee8 100644
--- a/content/splitbrowser/splitbrowser.xml
+++ b/content/splitbrowser/splitbrowser.xml
@@ -25,7 +25,7 @@
 			]]></getter>
 		</property>
 
-		<property name="collapsableParent" readonly="true">
+		<property name="flexibleParent" readonly="true">
 			<getter><![CDATA[
 				var c = this;
 				while (
@@ -39,6 +39,14 @@
 				return c == document.documentElement ? null : c ;
 			]]></getter>
 		</property>
+
+		<property name="contentCollapsed" readonly="true"
+			onget="return this.vContentCollapsed || this.hContentCollapsed;"/>
+		<property name="contentCompletelyCollapsed" readonly="true"
+			onget="return this.vContentCompletelyCollapsed &amp;&amp; this.hContentCompletelyCollapsed;"/>
+
+		<field name="lastwidth">-1</field>
+		<field name="lastheight">-1</field>
 	</implementation>
 </binding>
 
@@ -81,10 +89,15 @@
 
 		]]></constructor>
 
-		<field name="contentCollapsed">false</field>
+		<property name="vContentCollapsed" readonly="true"
+			onget="return this.vContainer.vContentCollapsed || (this.hContainer ? this.hContainer.vContentCollapsed : false );"/>
+		<property name="hContentCollapsed" readonly="true"
+			onget="return this.vContainer.hContentCollapsed || (this.hContainer ? this.hContainer.hContentCollapsed : false );"/>
 
-		<field name="lastwidth">-1</field>
-		<field name="lastheight">-1</field>
+		<property name="vContentCompletelyCollapsed" readonly="true"
+			onget="return this.vContainer.vContentCompletelyCollapsed &amp;&amp; (this.hContainer ? this.hContainer.vContentCompletelyCollapsed : true );"/>
+		<property name="hContentCompletelyCollapsed" readonly="true"
+			onget="return this.vContainer.hContentCompletelyCollapsed &amp;&amp; (this.hContainer ? this.hContainer.hContentCompletelyCollapsed : true );"/>
 	</implementation>
 
 	<handlers>
@@ -97,6 +110,122 @@
 	</handlers>
 </binding>
 
+<binding id="horizontal-container" extends="xul:hbox">
+	<implementation>
+		<property name="contentCollapsed" readonly="true"
+			onget="return this.vContentCollapsed || this.hContentCollapsed;"/>
+		<property name="vContentCollapsed" readonly="true">
+			<getter><![CDATA[
+				var collapsed = 0;
+
+				var nodes = this.childNodes;
+				for (var i = 0, maxi = nodes.length; i < maxi; i = i+2)
+					if (nodes[i].vContentCollapsed)
+						return true;
+
+				return false;
+			]]></getter>
+		</property>
+		<property name="hContentCollapsed" readonly="true">
+			<getter><![CDATA[
+				var collapsed = 0;
+
+				var nodes = this.childNodes;
+				for (var i = 0, maxi = nodes.length; i < maxi; i = i+2)
+					if (nodes[i].hContentCollapsed)
+						return true;
+
+				return false;
+			]]></getter>
+		</property>
+
+		<property name="contentCompletelyCollapsed" readonly="true"
+			onget="return this.vContentCompletelyCollapsed &amp;&amp; this.hContentCompletelyCollapsed;"/>
+		<property name="vContentCompletelyCollapsed" readonly="true">
+			<getter><![CDATA[
+				var expanded = 0;
+
+				var nodes = this.childNodes;
+				for (var i = 0, maxi = nodes.length; i < maxi; i = i+2)
+					if (!nodes[i].vContentCompletelyCollapsed)
+						return false;
+
+				return true;
+			]]></getter>
+		</property>
+		<property name="hContentCompletelyCollapsed" readonly="true">
+			<getter><![CDATA[
+				var expanded = 0;
+
+				var nodes = this.childNodes;
+				for (var i = 0, maxi = nodes.length; i < maxi; i = i+2)
+					if (!nodes[i].hContentCompletelyCollapsed)
+						return false;
+
+				return true;
+			]]></getter>
+		</property>
+	</implementation>
+</binding>
+
+<binding id="vertical-container" extends="xul:vbox">
+	<implementation>
+		<property name="contentCollapsed" readonly="true"
+			onget="return this.vContentCollapsed || this.hContentCollapsed;"/>
+		<property name="vContentCollapsed" readonly="true">
+			<getter><![CDATA[
+				var collapsed = 0;
+
+				var nodes = this.childNodes;
+				for (var i = 0, maxi = nodes.length; i < maxi; i = i+2)
+					if (nodes[i].vContentCollapsed)
+						return true;
+
+				return false;
+			]]></getter>
+		</property>
+		<property name="hContentCollapsed" readonly="true">
+			<getter><![CDATA[
+				var collapsed = 0;
+
+				var nodes = this.childNodes;
+				for (var i = 0, maxi = nodes.length; i < maxi; i = i+2)
+					if (nodes[i].hContentCollapsed)
+						return true;
+
+				return false;
+			]]></getter>
+		</property>
+
+		<property name="contentCompletelyCollapsed" readonly="true"
+			onget="return this.vContentCompletelyCollapsed &amp;&amp; this.hContentCompletelyCollapsed;"/>
+		<property name="vContentCompletelyCollapsed" readonly="true">
+			<getter><![CDATA[
+				var expanded = 0;
+
+				var nodes = this.childNodes;
+				for (var i = 0, maxi = nodes.length; i < maxi; i = i+2)
+					if (!nodes[i].vContentCompletelyCollapsed)
+						return false;
+
+				return true;
+			]]></getter>
+		</property>
+		<property name="hContentCompletelyCollapsed" readonly="true">
+			<getter><![CDATA[
+				var expanded = 0;
+
+				var nodes = this.childNodes;
+				for (var i = 0, maxi = nodes.length; i < maxi; i = i+2)
+					if (!nodes[i].hContentCompletelyCollapsed)
+						return false;
+
+				return true;
+			]]></getter>
+		</property>
+	</implementation>
+</binding>
+
 <binding id="toplevel-container" extends="#container">
 	<content orient="vertical">
 		<xul:vbox anonid="vertical-container" flex="1"
@@ -180,86 +309,125 @@
 		<property name="src" readonly="true"
 			onget="return gBrowser.currentURI.spec;"/>
 
-		<field name="FORCE_COLLAPSE">1</field>
-		<field name="FORCE_EXPAND">2</field>
-
 		<method name="toggleCollapsed">
-			<parameter name="aForceFlag"/>
 			<body><![CDATA[
-				var c = this.collapsableParent;
+				if (this.contentCollapsed)
+					this.expand();
+				else
+					this.collapse();
+			]]></body>
+		</method>
+
+		<method name="collapse">
+			<body><![CDATA[
+				var c = this.flexibleParent;
+				if (!c) return;
 
-				if (!aForceFlag || aForceFlag == this.FORCE_EXPAND) {
-					var cTemp = c;
-					var cTemp2;
-					var appcontent = document.getElementById('appcontent');
-					while (cTemp && cTemp != appcontent)
-					{
-						if (cTemp.contentCollapsed) cTemp2 = cTemp;
-						cTemp = cTemp.parentNode;
-					}
-					if (cTemp2) c = cTemp2;
-				}
-				else {
-					var cTemp = c;
-					var cTemp2;
+				var splitter = c.nextSibling || c.previousSibling;
+				var prop     = (splitter.getAttribute('orient') != 'vertical') ? 'width' : 'height' ;
+				var cProp    = (splitter.getAttribute('orient') != 'vertical') ? 'hContentCollapsed' : 'vContentCollapsed' ;
+				var cCProp   = (splitter.getAttribute('orient') != 'vertical') ? 'hContentCompletelyCollapsed' : 'vContentCompletelyCollapsed' ;
+
+				if (this[cProp]) return;
+
+				var sideBox = this.findSideBox(
+						c,
+						(c.getAttribute('splitter') == 'before' ? -1 : 1 ),
+						(splitter.getAttribute('orient') != 'vertical' ? 'horizontal' : 'vertical' )
+					);
+				if (!sideBox) return;
+
+/*
+var col = (['red', 'blue', 'green'])[parseInt(Math.random() * 3)];
+c.setAttribute('style', 'border: 2px dotted '+col+' !important;');
+sideBox.setAttribute('style', 'border: 2px solid '+col+' !important;');
+window.setTimeout(function() {
+c.removeAttribute('style');
+sideBox.removeAttribute('style');
+}, 2000);
+*/
+
+				var origSize = c.boxObject[prop];
+				var sideSize = sideBox.boxObject[prop];
+
+				c['last'+prop] = origSize;
+				c.setAttribute(prop, 0);
+				sideBox.removeAttribute('max'+prop);
+				sideBox.setAttribute(prop, sideSize + origSize);
+				c.setAttribute('max'+prop, 0);
+				this.focused = false;
+
+				window.setTimeout(function(aThis) {
+					aThis.toggleToolbar(false, true, 0);
+					if (nsPreferences.getBoolPref('splitbrowser.show.toolbar.always'))
+						aThis.mUpdateToolbarMode();
+
+					var node = c.parentNode;
 					var appcontent = document.getElementById('appcontent');
-					while (cTemp && cTemp != appcontent)
+					while (node && node != appcontent)
 					{
-						cTemp2 = cTemp;
-						cTemp = cTemp.parentContainer;
+						if (cCProp in node && node[cCProp])
+							node.setAttribute('max'+prop, 0);
+						node = node.parentNode;
 					}
-					if (cTemp2) c = cTemp2;
-				}
+				}, 0, this);
+			]]></body>
+		</method>
 
+		<method name="expand">
+			<parameter name="aForce"/>
+			<body><![CDATA[
+				var c = this.flexibleParent;
 				if (!c) return;
 
+				var splitter = c.nextSibling || c.previousSibling;
+				var prop     = (splitter.getAttribute('orient') == 'horizontal') ? 'width' : 'height' ;
+				var cProp    = (splitter.getAttribute('orient') != 'vertical') ? 'hContentCollapsed' : 'vContentCollapsed' ;
+
+				if (!this[cProp]) return;
+
+				var sideBox = this.findSideBox(
+						c,
+						(c.getAttribute('splitter') == 'before' ? -1 : 1 ),
+						(splitter.getAttribute('orient') != 'vertical' ? 'horizontal' : 'vertical' )
+					);
+				if (!sideBox) return;
+
+/*
+var col = (['red', 'blue', 'green'])[parseInt(Math.random() * 3)];
+c.setAttribute('style', 'border: 2px dotted '+col+' !important;');
+sideBox.setAttribute('style', 'border: 2px solid '+col+' !important;');
+window.setTimeout(function() {
+c.removeAttribute('style');
+sideBox.removeAttribute('style');
+}, 2000);
+*/
 
-				var sideBox;
-				var splitter;
-				if (c.getAttribute('splitter') == 'before') {
-					sideBox = c.previousSibling ? c.previousSibling.previousSibling : c.nextSibling.nextSibling ;
-					splitter = c.previousSibling || c.nextSibling;
-				}
-				else {
-					sideBox = c.nextSibling ? c.nextSibling.nextSibling : c.previousSibling.previousSibling ;
-					splitter = c.nextSibling || c.previousSibling;
-				}
+				var origSize = c.boxObject[prop];
+				var sideSize = sideBox.boxObject[prop];
 
-				if (!c.contentCollapsed && sideBox.contentCollapsed) {
-					if (c.getAttribute('splitter') == 'before') {
-						if (c.nextSibling) {
-							sideBox = c.nextSibling.nextSibling;
-							splitter.nextSibling;
-						}
-					}
-					else if (c.previousSibling) {
-						sideBox = c.previousSibling.previousSibling;
-						splitter.previousSibling;
-					}
+				var node = c;
+				var appcontent = document.getElementById('appcontent');
+				var sideBoxPos = 'before';
+				do {
+					node.removeAttribute('max'+prop);
+					if (node.nextSibling && node.nextSibling.nextSibling == sideBox)
+						sideBoxPos = 'after';
+					node = node.parentNode;
 				}
+				while (node && node != appcontent)
 
-				var prop = (splitter.getAttribute('orient') == 'horizontal') ? 'width' : 'height' ;
+				if (c['last'+prop] === void(0) || c['last'+prop] <= 0)
+					c['last'+prop] = parseInt(sideSize * 2 / 5);
+				c.setAttribute(prop, c['last'+prop]);
+				sideBox.setAttribute(prop, sideSize - (c['last'+prop] - origSize));
+				c['last'+prop] = -1;
+
+				this.mClearMaxSizeProp(
+					((sideBoxPos == 'after') ? sideBox.previousSibling.previousSibling : sideBox.nextSibling.nextSibling ),
+					prop
+				);
 
-				var origSize = c.boxObject[prop];
-				var sideSize = sideBox.boxObject[prop];
-				if (!this.contentCollapsed) {
-					c['last'+prop] = origSize;
-					c.setAttribute(prop, 0);
-					sideBox.removeAttribute('max'+prop);
-					sideBox.setAttribute(prop, sideSize + origSize);
-					c.contentCollapsed = true;
-					c.setAttribute('max'+prop, 0);
-					this.focused = false;
-				}
-				else {
-					c.removeAttribute('max'+prop);
-					c.contentCollapsed = false;
-					if (c['last'+prop] === void(0) || c['last'+prop] <= 0)
-						c['last'+prop] = parseInt(sideSize * 2 / 5);
-					c.setAttribute(prop, c['last'+prop]);
-					sideBox.setAttribute(prop, sideSize - (c['last'+prop] - origSize));
-					c['last'+prop] = -1;
-				}
 
 				window.setTimeout(function(aThis) {
 					aThis.toggleToolbar(false, true, 0);
@@ -268,7 +436,88 @@
 				}, 0, this);
 			]]></body>
 		</method>
+		<method name="mClearMaxSizeProp">
+			<parameter name="aNode"/>
+			<parameter name="aProp"/>
+			<body><![CDATA[
+				if (aNode == this) return;
+				aNode.removeAttribute('max'+aProp);
+				if (aNode['last'+aProp]) aNode['last'+aProp] = -1;
+				for (var i = 0, maxi = aNode.childNodes.length; i < maxi; i = i+2)
+				{
+					this.mClearMaxSizeProp(aNode.childNodes[i], aProp);
+				}
+			]]></body>
+		</method>
+
+
+		<method name="findSideBox">
+			<parameter name="aBox"/>
+			<parameter name="aDir"/>
+			<parameter name="aOrient"/>
+			<body><![CDATA[
+				var cProp  = (aOrient != 'vertical') ? 'hContentCollapsed' : 'vContentCollapsed' ;
+
+				var target = aBox;
+				if (aDir < 0) {
+					while (target && target.previousSibling)
+					{
+						target = target.previousSibling.previousSibling;
+						if (!target[cProp])
+							return target;
+					}
+
+					target = aBox;
+					while (target && target.nextSibling)
+					{
+						target = target.nextSibling.nextSibling;
+						if (!target[cProp]) return target;
+					}
+				}
+				else {
+					while (target && target.nextSibling)
+					{
+						target = target.nextSibling.nextSibling;
+						if (!target[cProp]) return target;
+					}
+
+					target = aBox;
+					while (target && target.previousSibling)
+					{
+						target = target.previousSibling.previousSibling;
+						if (!target[cProp]) return target;
+					}
+				}
 
+				var appcontent = document.getElementById('appcontent');
+
+				target = aBox;
+				var orientBox;
+				do {
+					target = target.parentNode;
+
+					orientBox = (target.localName == 'subbrowser-container') ? (target.previousSibling || target.nextSibling || target.parentNode) : target ;
+					if (orientBox.localName == 'splitter') {
+						if (orientBox.getAttribute('orient') != aOrient)
+							continue;
+						else
+							break;
+					}
+					else {
+						if (window.getComputedStyle(orientBox, '').getPropertyValue('-moz-box-orient') != aOrient)
+							continue;
+						else
+							break;
+					}
+				}
+				while (target != appcontent);
+
+				if (target == appcontent)
+					return null;
+				else
+					return this.findSideBox(target, aDir, aOrient);
+			]]></body>
+		</method>
 
 		<method name="checkEventFiredOnEdge">
 			<parameter name="aEvent"/>
@@ -444,6 +693,19 @@
 	</handlers>
 </binding>
 
+<binding id="subbrowser-primary" extends="#subbrowser-base">
+	<implementation>
+		<property name="vContentCollapsed" readonly="true"
+			onget="return this.boxObject.width == 0;"/>
+		<property name="hContentCollapsed" readonly="true"
+			onget="return this.boxObject.height == 0;"/>
+		<property name="vContentCompletelyCollapsed" readonly="true"
+			onget="return this.vContentCollapsed"/>
+		<property name="hContentCompletelyCollapsed" readonly="true"
+			onget="return this.hContentCollapsed"/>
+	</implementation>
+</binding>
+
 <binding id="subbrowser" extends="#subbrowser-base">
 	<content orient="vertical"
 		context="_child">
@@ -459,10 +721,10 @@
 				oncommand="this.parentNode.parentNode.close();"/>
 			<xul:menuitem class="subbrowser-context-collapse"
 				label="&splitbrowser.subbrowser.menu.collapse;"
-				oncommand="this.parentNode.parentNode.toggleCollapsed();"/>
+				oncommand="this.parentNode.parentNode.collapse();"/>
 			<xul:menuitem class="subbrowser-context-expand"
 				label="&splitbrowser.subbrowser.menu.expand;"
-				oncommand="this.parentNode.parentNode.toggleCollapsed();"/>
+				oncommand="this.parentNode.parentNode.expand();"/>
 			<xul:menuseparator/>
 			<xul:menuitem class="subbrowser-context-openNewTab"
 				label="&splitbrowser.subbrowser.menu.openNewTab;"
@@ -493,13 +755,13 @@
 				<xul:toolbarbutton
 					anonid="collapse-button-vertical"
 					tooltiptext="&splitbrowser.subbrowser.collapse.tooltip;"
-					oncommand="this.parentNode.parentNode.parentNode.parentNode.toggleCollapsed();"
+					oncommand="this.parentNode.parentNode.parentNode.parentNode.collapse();"
 					ondblclick="event.stopPropagation();"
 					class="subbrowser-toolbar-item button collapse"/>
 				<xul:toolbarbutton
 					anonid="expand-button-vertical"
 					tooltiptext="&splitbrowser.subbrowser.expand.tooltip;"
-					oncommand="this.parentNode.parentNode.parentNode.parentNode.toggleCollapsed();"
+					oncommand="this.parentNode.parentNode.parentNode.parentNode.expand();"
 					ondblclick="event.stopPropagation();"
 					class="subbrowser-toolbar-item button expand"/>
 				<xul:box class="subbrowser-toolbar-item favicon-box">
@@ -634,13 +896,13 @@
 					<xul:toolbarbutton
 						anonid="collapse-button"
 						tooltiptext="&splitbrowser.subbrowser.collapse.tooltip;"
-						oncommand="this.parentNode.parentNode.parentNode.parentNode.parentNode.toggleCollapsed();"
+						oncommand="this.parentNode.parentNode.parentNode.parentNode.parentNode.collapse();"
 						ondblclick="event.stopPropagation();"
 						class="subbrowser-toolbar-item button collapse"/>
 					<xul:toolbarbutton
 						anonid="expand-button"
 						tooltiptext="&splitbrowser.subbrowser.expand.tooltip;"
-						oncommand="this.parentNode.parentNode.parentNode.parentNode.parentNode.toggleCollapsed();"
+						oncommand="this.parentNode.parentNode.parentNode.parentNode.parentNode.expand();"
 						ondblclick="event.stopPropagation();"
 						class="subbrowser-toolbar-item button expand"/>
 					<xul:toolbarbutton
@@ -801,12 +1063,14 @@
 			-1
 		</field>
 
-		<property name="contentCollapsed"
-			onset="return val;">
-			<getter><![CDATA[
-				return this.boxObject.width <= this.minSize || this.boxObject.height <= this.minSize;
-			]]></getter>
-		</property>
+		<property name="vContentCollapsed" readonly="true"
+			onget="return this.boxObject.height &lt;= this.minSize;"/>
+		<property name="hContentCollapsed" readonly="true"
+			onget="return this.boxObject.width &lt;= this.minSize;"/>
+		<property name="vContentCompletelyCollapsed" readonly="true"
+			onget="return this.vContentCollapsed"/>
+		<property name="hContentCompletelyCollapsed" readonly="true"
+			onget="return this.hContentCollapsed"/>
 
 		<method name="updateContextMenu">
 			<parameter name="aEvent"/>
@@ -1528,50 +1792,49 @@
 
 		<method name="mUpdateToolbarMode">
 			<body><![CDATA[
-				var c = this.collapsableParent;
+				var c = this.flexibleParent;
 				while (c && c.parentNode && !c.splitterDragging)
 					c = c.parentNode;
 				if (c && c == document) c = null;
 
+				var collapse;
+
 				if (this.boxObject.width <= this.minSize) {
 					if (this.boxObject.height <= this.minSize) {
 						this.setAttribute('toolbar-mode', 'horizontal');
-						if (c) {
-							c.setAttribute('maxheight', 0);
-							c.contentCollapsed = true;
-						}
+						if (c) c.setAttribute('maxheight', 0);
 					}
 					else {
 						this.setAttribute('toolbar-mode', 'vertical');
-						if (c) {
-							c.setAttribute('maxwidth', 0);
-							c.contentCollapsed = true;
-						}
+						if (c) c.setAttribute('maxwidth', 0);
 					}
-					this.setAttribute('content-collapsed', 'true');
-					var newEvent = document.createEvent('Events');
-					newEvent.initEvent('SubBrowserContentCollapsed', false, true);
-					document.documentElement.dispatchEvent(newEvent);
+					collapse = true;
 				}
 				else {
 					this.setAttribute('toolbar-mode', 'horizontal');
 					if (this.boxObject.height <= this.minSize) {
-						if (c) {
-							c.setAttribute('maxheight', 0);
-							c.contentCollapsed = true;
-						}
-						this.setAttribute('content-collapsed', 'true');
-						var newEvent = document.createEvent('Events');
-						newEvent.initEvent('SubBrowserContentCollapsed', false, true);
-						document.documentElement.dispatchEvent(newEvent);
+						if (c) c.setAttribute('maxheight', 0);
+						collapse = true;
 					}
 					else {
-						this.removeAttribute('content-collapsed');
-						var newEvent = document.createEvent('Events');
-						newEvent.initEvent('SubBrowserContentExpanded', false, true);
-						document.documentElement.dispatchEvent(newEvent);
+						collapse = false;
 					}
 				}
+
+				if (collapse) {
+					if (!this.contentCollapsed)
+						this.collapse();
+					this.setAttribute('content-collapsed', 'true');
+					var newEvent = document.createEvent('Events');
+					newEvent.initEvent('SubBrowserContentCollapsed', false, true);
+					document.documentElement.dispatchEvent(newEvent);
+				}
+				else {
+					this.removeAttribute('content-collapsed');
+					var newEvent = document.createEvent('Events');
+					newEvent.initEvent('SubBrowserContentExpanded', false, true);
+					document.documentElement.dispatchEvent(newEvent);
+				}
 			]]></body>
 		</method>