Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 837486 - Reposition pinned tabs when resetting tab strip underflow. r=dao

Browse Source
This commit is contained in:
Frank Yan 2013-02-21 16:55:47 -08:00
parent dfdaa6062f
commit 6a56a4d061
3 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
browser/base/content/browser.css
View File

@ -25,8 +25,9 @@ tabbrowser {
visibility: collapse;
}
#tabbrowser-tabs:not([overflow="true"])[using-closing-tabs-spacer] ~ #alltabs-button {
visibility: hidden; /* temporary space to keep a tab's close button under the cursor */
#tabbrowser-tabs[overflow=true] > .tabbrowser-arrowscrollbox > .scrollbutton-up[collapsed=true],
#tabbrowser-tabs[overflow=true] > .tabbrowser-arrowscrollbox > .scrollbutton-down[collapsed=true] {
visibility: visible; /* keep a tab's close button under the cursor while it's closing tabs */
}
.tabbrowser-tab {

46
browser/base/content/tabbrowser.xml
View File

@ -2846,17 +2846,13 @@
var tabs = document.getBindingParent(this);
if (tabs.hasAttribute("dontresize") || tabs.hasAttribute("using-closing-tabs-spacer")) {
tabs.mTabstrip._scrollButtonUp.style.visibility = "hidden";
tabs.mTabstrip._scrollButtonDown.style.visibility = "hidden";
} else {
tabs.removeAttribute("overflow");
}
tabs.tabbrowser._removingTabs.forEach(tabs.tabbrowser.removeTab,
tabs.tabbrowser);
tabs._positionPinnedTabs();
if (!tabs.hasAttribute("dontresize") && !tabs._closingTabsSpacer.style.minWidth) {
tabs.removeAttribute("overflow");
tabs._positionPinnedTabs();
}
]]></handler>
<handler event="overflow"><![CDATA[
if (event.detail == 0)
@ -3112,16 +3108,19 @@
if (!tabs.length)
return;
var isEndTab = (aTab._tPos > tabs[tabs.length-1]._tPos);
var tabWidth = aTab.getBoundingClientRect().width;
this.tabbrowser.addEventListener("mousemove", this, false);
window.addEventListener("mouseout", this, false);
// Locking is neither in effect nor needed, so let tabs expand normally.
if (isEndTab && !this.hasAttribute("dontresize"))
return;
// Let spacer grow to the maximum and lock it, then let tabs expand normally
let isEndTab = (aTab._tPos > tabs[tabs.length-1]._tPos);
if (isEndTab) {
let spacer = this._closingTabsSpacer;
if (!spacer.style.minWidth)
spacer.style.minWidth = 0;
// Locking is neither in effect nor needed, so let tabs expand normally
if (!this.hasAttribute("dontresize"))
return;
spacer.style.MozBoxFlex = 1;
spacer.style.minWidth = getComputedStyle(spacer).width;
spacer.style.MozBoxFlex = "";
@ -3134,6 +3133,7 @@
}
if (!this.hasAttribute("dontresize")) {
let tabWidth = aTab.getBoundingClientRect().width;
this._delayResizingRule.style.setProperty("max-width", tabWidth + "px", "important");
this.setAttribute("dontanimate", "true");
this.setAttribute("dontresize", "true");
@ -3144,21 +3144,16 @@
if (!this.mTabstrip._scrollButtonUp.disabled) {
let spacer = this._closingTabsSpacer;
let width = parseFloat(spacer.style.minWidth) || 0;
width += tabWidth;
width += aTab.getBoundingClientRect().width;
if (!this.mTabstrip._scrollButtonDown.disabled) {
let scrollbox = this.mTabstrip._scrollbox;
width -= scrollbox.scrollLeftMax - scrollbox.scrollLeft;
}
if (width >= 0) {
if (width >= 0)
spacer.style.minWidth = width + "px";
this.setAttribute("using-closing-tabs-spacer", "true");
}
}
this.tabbrowser.addEventListener("mousemove", this, false);
window.addEventListener("mouseout", this, false);
]]></body>
</method>
@ -3168,13 +3163,12 @@
window.removeEventListener("mouseout", this, false);
this._closingTabsSpacer.style.minWidth = "";
this.removeAttribute("using-closing-tabs-spacer");
this.removeAttribute("dontresize");
if (this.hasAttribute("overflow") && this.mTabstrip._scrollbox.scrollWidth <= this.mTabstrip._scrollbox.clientWidth) {
this.mTabstrip._scrollButtonUp.style.visibility = "";
this.mTabstrip._scrollButtonDown.style.visibility = "";
if (this.hasAttribute("overflow") &&
this.mTabstrip._scrollbox.scrollWidth <= this.mTabstrip._scrollbox.clientWidth) {
this.removeAttribute("overflow");
this._positionPinnedTabs();
}
]]></body>
</method>

2
toolkit/content/widgets/scrollbox.xml
View File

@ -454,7 +454,7 @@
else
disableUpButton = true;
}
else if (this.scrollClientSize + this.scrollPosition == this.scrollSize) {
if (this.scrollClientSize + this.scrollPosition == this.scrollSize) {
// In the RTL case, this means the _first_ element in the
// scrollbox is visible
if (this._isRTLScrollbox)