表示が一部崩れていたのを修正

git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@6426 599a83e7-65a4-db11-8015-0010dcdd6dc2

content/treestyletab/treestyletab.css

@@ -74,6 +74,13 @@ tabbrowser[treestyletab-mode="vertical"] .tabs-stack > *:first-child + * > hbox:
 }
 
 
+#TabsToolbar:not([treestyletab-tabbar-position="top"]) {
+	line-height: 1 !important;
+	position: fixed !important;
+	-moz-appearance: none !important;
+}
+
+
 
 .tabbrowser-tabs:not([treestyletab-mode="vertical"]) .tabbrowser-tab:not([treestyletab-nest="0"]) + .tabbrowser-tab[treestyletab-nest="0"],
 .tabbrowser-tabs:not([treestyletab-mode="vertical"]) .tabbrowser-tab[treestyletab-nest="0"] + .tabbrowser-tab[treestyletab-nest="0"][treestyletab-children] {

content/treestyletab/treestyletabbrowser.js

@@ -1163,14 +1163,7 @@ TreeStyleTabBrowser.prototype = {
 
 		var strip = this.tabStrip;
 		var tabContainer = this.mTabBrowser.tabContainer;
-		if (this.currentTabbarPosition == 'top') {
+		if (this.currentTabbarPosition != 'top') {
-			strip.style.position = 'static';
-			strip.style.MozAppearance = '';
-		}
-		else {
-			strip.style.position = 'fixed';
-			strip.style.MozAppearance = 'none';
-
 			let box = placeholder.boxObject;
 			let root = document.documentElement.boxObject;
 			strip.style.top = (box.screenY - root.screenY)+'px';

platform/Darwin/skin/classic/treestyletab/license.txt

@@ -14,7 +14,7 @@ License.
 The Original Code is the Tree Style Tab.
 
 The Initial Developer of the Original Code is SHIMODA Hiroshi.
-Portions created by the Initial Developer are Copyright (C) 2008-2009
+Portions created by the Initial Developer are Copyright (C) 2008-2010
 the Initial Developer. All Rights Reserved.
 
 Contributor(s): SHIMODA Hiroshi <piro@p.club.ne.jp>

platform/Darwin/skin/classic/treestyletab/treestyletab.css

@@ -2,23 +2,41 @@
 
 /* Square */
 
-tabbrowser[treestyletab-style~="square"][treestyletab-tabbar-position="left"]:not([treestyletab-tabbar-fixed="true"]) .treestyletab-splitter {
+tabbrowser[treestyletab-style~="square"][treestyletab-tabbar-position="left"]:not([treestyletab-tabbar-fixed="true"])
+  .treestyletab-splitter {
 	border-right: 1px solid ThreeDShadow !important;
 	-moz-border-right-colors: ThreeDShadow !important;
 }
-tabbrowser[treestyletab-style~="square"][treestyletab-tabbar-position="right"]:not([treestyletab-tabbar-fixed="true"]) .treestyletab-splitter {
+tabbrowser[treestyletab-style~="square"][treestyletab-tabbar-position="right"]:not([treestyletab-tabbar-fixed="true"])
+  .treestyletab-splitter {
 	border-left: 1px solid ThreeDShadow !important;
 	-moz-border-left-colors: ThreeDShadow !important;
 }
 
-#main-window:not([active="true"]) tabbrowser[treestyletab-style~="square"][treestyletab-mode="vertical"] .tabbrowser-tab > .tab-image-middle,
+#main-window:not([active="true"])
-#main-window:not([active="true"]) tabbrowser[treestyletab-style~="square"][treestyletab-mode="vertical"] .tabbrowser-tab > .tab-close-button,
+  .tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
-#main-window:not([active="true"]) tabbrowser[treestyletab-style~="square"][treestyletab-mode="vertical"] .tabbrowser-tab[selected="true"] > .tab-image-middle,
+  .tabbrowser-tab > .tab-image-middle,
-#main-window:not([active="true"]) tabbrowser[treestyletab-style~="square"][treestyletab-mode="vertical"] .tabbrowser-tab[selected="true"] > .tab-close-button,
+#main-window:not([active="true"])
-#main-window:not([active="true"]) tabbrowser[treestyletab-style~="square"][treestyletab-tabbar-position="bottom"] .tabbrowser-tab > .tab-image-middle,
+  .tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
-#main-window:not([active="true"]) tabbrowser[treestyletab-style~="square"][treestyletab-tabbar-position="bottom"] .tabbrowser-tab > .tab-close-button,
+  .tabbrowser-tab > .tab-close-button,
-#main-window:not([active="true"]) tabbrowser[treestyletab-style~="square"][treestyletab-tabbar-position="bottom"] .tabbrowser-tab[selected="true"] > .tab-image-middle,
+#main-window:not([active="true"])
-#main-window:not([active="true"]) tabbrowser[treestyletab-style~="square"][treestyletab-tabbar-position="bottom"] .tabbrowser-tab[selected="true"] > .tab-close-button {
+  .tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
+  .tabbrowser-tab[selected="true"] > .tab-image-middle,
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
+  .tabbrowser-tab[selected="true"] > .tab-close-button,
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-style~="square"][treestyletab-tabbar-position="bottom"]
+  .tabbrowser-tab > .tab-image-middle,
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-style~="square"][treestyletab-tabbar-position="bottom"]
+  .tabbrowser-tab > .tab-close-button,
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-style~="square"][treestyletab-tabbar-position="bottom"]
+  .tabbrowser-tab[selected="true"] > .tab-image-middle,
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-style~="square"][treestyletab-tabbar-position="bottom"]
+  .tabbrowser-tab[selected="true"] > .tab-close-button {
 	height: auto;
 	margin: 0 !important;
 	padding: 0 !important;
@@ -29,13 +47,13 @@ tabbrowser[treestyletab-style~="square"][treestyletab-tabbar-position="right"]:n
 
 /* Metal */
 
-tabbrowser[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab .tab-close-button {
 	padding-left: 0 !important;
 	padding-right: 0 !important;
 }
 
-tabbrowser[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
   .tabbrowser-strip {
 	border-bottom: 0 none !important;
 }
@@ -43,52 +61,67 @@ tabbrowser[treestyletab-style="metal"][treestyletab-mode="vertical"]
 
 /* horizontal tree */
 
-tabbrowser[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+.tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"] {
-  .tabbrowser-tabs {
 	height: auto;
 	background: #bbb;
 }
 
-#main-window[active="true"] tabbrowser[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+#main-window[active="true"]
-  .tabbrowser-tabs {
+  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"] {
 	background: #777;
 }
 
-#main-window[active="true"] tabbrowser[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+#main-window[active="true"]
+  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
   .tabbrowser-tab:not([selected="true"]) .tab-image-middle,
-#main-window[active="true"] tabbrowser[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+#main-window[active="true"]
+  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
   .tabbrowser-tab:not([selected="true"]) .tab-close-button,
-#main-window:not([active="true"]) tabbrowser[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
   .tabbrowser-tab:not([selected="true"]) .tab-image-middle,
-#main-window:not([active="true"]) tabbrowser[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
   .tabbrowser-tab:not([selected="true"]) .tab-close-button,
-#main-window[active="true"] tabbrowser[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+#main-window[active="true"]
+  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
   .tabbrowser-tab[selected="true"] .tab-image-middle,
-#main-window[active="true"] tabbrowser[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+#main-window[active="true"]
+  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
   .tabbrowser-tab[selected="true"] .tab-close-button,
-#main-window:not([active="true"]) tabbrowser[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
   .tabbrowser-tab[selected="true"] .tab-image-middle,
-#main-window:not([active="true"]) tabbrowser[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
   .tabbrowser-tab[selected="true"] .tab-close-button {
 	background-position: left bottom;
 	background-repeat: repeat-x;
 }
 
-#main-window[active="true"] tabbrowser[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+#main-window[active="true"]
+  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
   .tabbrowser-tab:not([selected="true"]) .tab-image-left,
-#main-window[active="true"] tabbrowser[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+#main-window[active="true"]
+  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
   .tabbrowser-tab:not([selected="true"]) .tab-image-right,
-#main-window:not([active="true"]) tabbrowser[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
   .tabbrowser-tab:not([selected="true"]) .tab-image-left,
-#main-window:not([active="true"]) tabbrowser[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
   .tabbrowser-tab:not([selected="true"]) .tab-image-right,
-#main-window[active="true"] tabbrowser[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+#main-window[active="true"]
+  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
   .tabbrowser-tab[selected="true"] .tab-image-left,
-#main-window[active="true"] tabbrowser[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+#main-window[active="true"]
+  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
   .tabbrowser-tab[selected="true"] .tab-image-right,
-#main-window:not([active="true"]) tabbrowser[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
   .tabbrowser-tab[selected="true"] .tab-image-left,
-#main-window:not([active="true"]) tabbrowser[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
   .tabbrowser-tab[selected="true"] .tab-image-right {
 	background-position: left bottom;
 	background-repeat: no-repeat;

platform/Linux/skin/classic/treestyletab/license.txt

@@ -14,7 +14,7 @@ License.
 The Original Code is the Tree Style Tab.
 
 The Initial Developer of the Original Code is SHIMODA Hiroshi.
-Portions created by the Initial Developer are Copyright (C) 2008
+Portions created by the Initial Developer are Copyright (C) 2008-2010
 the Initial Developer. All Rights Reserved.
 
 Contributor(s): SHIMODA Hiroshi <piro@p.club.ne.jp>

platform/Linux/skin/classic/treestyletab/treestyletab-3.5.css

@@ -1,6 +1,6 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-tabbrowser[treestyletab-style~="square"]:not([treestyletab-style="vertigo"])[treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-style="vertigo"])[treestyletab-mode="vertical"]
   .tabbrowser-tab {
 	z-index: auto;
 }

platform/Linux/skin/classic/treestyletab/treestyletab.css

@@ -3,9 +3,9 @@
 
 /* horizontal tree */
 
-tabbrowser[treestyletab-style][treestyletab-tabbar-position="top"][treestyletab-tabs-indented="true"]
+.tabbrowser-tabs[treestyletab-style][treestyletab-tabbar-position="top"][treestyletab-tabs-indented="true"]
   .tabbrowser-tab:not([selected="true"]),
-tabbrowser[treestyletab-style][treestyletab-tabbar-position="top"][treestyletab-tabs-indented="true"]
+.tabbrowser-tabs[treestyletab-style][treestyletab-tabbar-position="top"][treestyletab-tabs-indented="true"]
   .tabbrowser-tab[selected="true"] {
 	padding-top: 0;
 	padding-bottom: 0;
@@ -17,11 +17,13 @@ tabbrowser[treestyletab-style][treestyletab-tabbar-position="top"][treestyletab-
 
 /* vertical tree */
 
-tabbrowser[treestyletab-style~="square"][treestyletab-tabbar-position="left"]:not([treestyletab-tabbar-transparent="full"]) .tabbrowser-strip {
+.tabbrowser-strip[treestyletab-style~="square"][treestyletab-tabbar-position="left"]:not([treestyletab-tabbar-transparent="full"]),
+#TabsToolbar[treestyletab-style~="square"][treestyletab-tabbar-position="left"]:not([treestyletab-tabbar-transparent="full"]) {
 	border-right: 1px solid ThreeDShadow !important;
 	-moz-border-right-colors: none !important;
 }
-tabbrowser[treestyletab-style~="square"][treestyletab-tabbar-position="right"]:not([treestyletab-tabbar-transparent="full"]) .tabbrowser-strip {
+.tabbrowser-strip[treestyletab-style~="square"][treestyletab-tabbar-position="right"]:not([treestyletab-tabbar-transparent="full"]),
+#TabsToolbar[treestyletab-style~="square"][treestyletab-tabbar-position="right"]:not([treestyletab-tabbar-transparent="full"]) {
 	border-left: 1px solid ThreeDShadow !important;
 	-moz-border-right-colors: none !important;
 }

platform/WINNT/skin/classic/treestyletab/treestyletab.css

@@ -1,12 +1,12 @@
 /* horizontal tree */
 
-tabbrowser[treestyletab-style][treestyletab-tabbar-position="top"][treestyletab-tabs-indented="true"]
+.tabbrowser-tabs[treestyletab-style][treestyletab-tabbar-position="top"][treestyletab-tabs-indented="true"]
   .tabbrowser-tab:not([selected="true"]),
-tabbrowser[treestyletab-style][treestyletab-tabbar-position="top"][treestyletab-tabs-indented="true"]
+.tabbrowser-tabs[treestyletab-style][treestyletab-tabbar-position="top"][treestyletab-tabs-indented="true"]
   .tabbrowser-tab[selected="true"],
-tabbrowser[treestyletab-style][treestyletab-tabbar-position="top"][treestyletab-tabs-indented="true"]
+.tabbrowser-tabs[treestyletab-style][treestyletab-tabbar-position="top"][treestyletab-tabs-indented="true"]
   .tabbrowser-tab:hover:not([selected="true"]),
-tabbrowser[treestyletab-style][treestyletab-tabbar-position="top"][treestyletab-tabs-indented="true"]
+.tabbrowser-tabs[treestyletab-style][treestyletab-tabbar-position="top"][treestyletab-tabs-indented="true"]
   .tabbrowser-tab:hover[selected="true"] {
 	padding-top: 0;
 	padding-bottom: 0;

skin/classic/treestyletab/metal/base.css

@@ -2,6 +2,13 @@
 
 /* tab bar */
 
+#TabsToolbar[treestyletab-style="metal"][treestyletab-mode="vertical"]:not([treestyletab-tabbar-position="top"]) {
+	border: 0 none !important;
+	margin: 0 !important;
+	padding: 0 !important;
+	-moz-box-shadow: none !important;
+}
+
 .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
   .tabs-bottom,
 .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]

skin/classic/treestyletab/sidebar/sidebar.css

@@ -3,14 +3,14 @@
 /* Unset bottom border, instead let's have a border on the right-hand
    side, much like the sidebar does. */
 .tabbrowser-strip[treestyletab-style="sidebar"][treestyletab-mode="vertical"],
-toolbar[treestyletab-style="sidebar"][treestyletab-mode="vertical"] {
+#TabsToolbar[treestyletab-style="sidebar"][treestyletab-mode="vertical"] {
   border-top: 1px solid #404040;
   border-bottom: none !important;
 }
 #main-window:not([active="true"])
 .tabbrowser-strip[treestyletab-style="sidebar"][treestyletab-mode="vertical"],
 #main-window:not([active="true"])
-toolbar[treestyletab-style="sidebar"][treestyletab-mode="vertical"] {
+#TabsToolbar[treestyletab-style="sidebar"][treestyletab-mode="vertical"] {
   border-top: 1px solid #868686;
 }
 
@@ -237,6 +237,13 @@ tabbrowser[treestyletab-style="sidebar"][treestyletab-mode="vertical"] .treestyl
 
 /* changed from original SidebarStyleTab */
 
+#TabsToolbar[treestyletab-style="sidebar"][treestyletab-mode="vertical"]:not([treestyletab-tabbar-position="top"]) {
+	border: 0 none !important;
+	margin: 0 !important;
+	padding: 0 !important;
+	-moz-box-shadow: none !important;
+}
+
 .tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
   .treestyletab-counter-paren {
   display: none !important;

skin/classic/treestyletab/square/square.css

@@ -21,6 +21,13 @@ toolbar[treestyletab-style~="square"][treestyletab-mode="vertical"],
 	padding-right: 0 !important;
 }
 
+#TabsToolbar[treestyletab-style~="square"][treestyletab-mode="vertical"]:not([treestyletab-tabbar-position="top"]) {
+	border: 0 none !important;
+	margin: 0 !important;
+	padding: 0 !important;
+	-moz-box-shadow: none !important;
+}
+
 .tabbrowser-strip[treestyletab-style~="square"][treestyletab-tabbar-position="left"][treestyletab-tabbar-fixed="true"]:not([treestyletab-tabbar-transparent="full"]),
 toolbar[treestyletab-style~="square"][treestyletab-tabbar-position="left"][treestyletab-tabbar-fixed="true"]:not([treestyletab-tabbar-transparent="full"]) {
 	border-right: 1px solid ThreeDShadow !important;