stonewareslord/treestyletab
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Calculate style rules for narrow scroll bar more intelligently #240

Browse Source
This commit is contained in:
Piro / YUKI Hiroshi 2016-02-13 01:50:15 +09:00
parent 0a86767afb
commit 6ca9f61115
2 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/browser.js
View File

@ -2798,7 +2798,7 @@ TreeStyleTabBrowser.prototype = inherit(TreeStyleTabWindow.prototype, {
case 'extensions.treestyletab.tabbar.narrowScrollbar.width': case 'extensions.treestyletab.tabbar.narrowScrollbar.width':
if (this.isVertical && if (this.isVertical &&
this.mTabBrowser.mTabContainer.getAttribute('overflow') == 'true') this.mTabBrowser.mTabContainer.getAttribute('overflow') == 'true')
utils.updateNarrowScrollbarStyle(); utils.updateNarrowScrollbarStyle(this.browser);
return; return;
case 'extensions.treestyletab.maxTreeLevel.physical': case 'extensions.treestyletab.maxTreeLevel.physical':
@ -5151,7 +5151,7 @@ TreeStyleTabBrowser.prototype = inherit(TreeStyleTabWindow.prototype, {
if (aEvent.type == 'overflow') { if (aEvent.type == 'overflow') {
tabs.setAttribute('overflow', 'true'); tabs.setAttribute('overflow', 'true');
this.scrollBoxObject.ensureElementIsVisible(tabs.selectedItem); this.scrollBoxObject.ensureElementIsVisible(tabs.selectedItem);
utils.updateNarrowScrollbarStyle(); utils.updateNarrowScrollbarStyle(this.browser);
} }
else { else {
tabs.removeAttribute('overflow'); tabs.removeAttribute('overflow');

48
modules/utils.js
View File

@ -499,7 +499,7 @@ var TreeStyleTabUtils = {
}, },
updateNarrowScrollbarStyle : function utils_updateNarrowScrollbarStyle() updateNarrowScrollbarStyle : function utils_updateNarrowScrollbarStyle(aTabBrowser)
{ {
if (this.updatingNarrowScrollbarStyle) if (this.updatingNarrowScrollbarStyle)
return; return;
@ -516,9 +516,43 @@ var TreeStyleTabUtils = {
SSS.sheetRegistered(this.lastAgentSheetForNarrowScrollbar, SSS.AGENT_SHEET)) SSS.sheetRegistered(this.lastAgentSheetForNarrowScrollbar, SSS.AGENT_SHEET))
SSS.unregisterSheet(this.lastAgentSheetForNarrowScrollbar, SSS.AGENT_SHEET); SSS.unregisterSheet(this.lastAgentSheetForNarrowScrollbar, SSS.AGENT_SHEET);
var scrollbox = aTabBrowser.tabContainer.mTabstrip._scrollbox;
var d = scrollbox.ownerDocument;
var scrollbarSize = this.lastOriginalScrollbarSize;
if (scrollbarSize == 0) {
let nodes = d.getAnonymousNodes(scrollbox);
if (nodes) {
for (let i = 0, maxi = nodes.length; i < maxi; i++)
{
if (nodes[i].localName != 'box')
continue;
scrollbarSize = scrollbox.boxObject.width - nodes[i].boxObject.width;
break;
}
}
}
var size = this.getTreePref('tabbar.narrowScrollbar.width');
var rulesToSizeScrollbar;
var rulesToSizeScrollbarContents;
if (scrollbarSize) {
let overWidth = size - scrollbarSize;
let leftMargin = Math.floor(overWidth / 2);
let rightMargin = overWidth - leftMargin;
rulesToSizeScrollbar = 'margin-left: '+leftMargin+'px;' +
'margin-right: '+rightMargin+'px;';
}
else {
rulesToSizeScrollbar = 'font-size: '+size+'px;';
rulesToSizeScrollbarContents = 'max-width: '+size+'px;' +
'min-width: '+size+'px;';
}
const style = 'data:text/css,'+encodeURIComponent( const style = 'data:text/css,'+encodeURIComponent(
('@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");' + ('@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");' +
(rulesToSizeScrollbarContents ?
'tabs.tabbrowser-tabs[%MODE%="vertical"][%NARROW%="true"]' + 'tabs.tabbrowser-tabs[%MODE%="vertical"][%NARROW%="true"]' +
' .tabbrowser-arrowscrollbox' + ' .tabbrowser-arrowscrollbox' +
' > scrollbox' + ' > scrollbox' +
@ -526,17 +560,12 @@ var TreeStyleTabUtils = {
'tabs.tabbrowser-tabs[%MODE%="vertical"][%NARROW%="true"]' + 'tabs.tabbrowser-tabs[%MODE%="vertical"][%NARROW%="true"]' +
' .tabbrowser-arrowscrollbox' + ' .tabbrowser-arrowscrollbox' +
' > scrollbox' + ' > scrollbox' +
' > scrollbar[orient="vertical"] * {' + ' > scrollbar[orient="vertical"] * {' + rulesToSizeScrollbarContents + '}' : '' ) +
' max-width: %SIZE%px;' +
' min-width: %SIZE%px;' +
'}' +
'tabs.tabbrowser-tabs[%MODE%="vertical"][%NARROW%="true"]' + 'tabs.tabbrowser-tabs[%MODE%="vertical"][%NARROW%="true"]' +
' .tabbrowser-arrowscrollbox' + ' .tabbrowser-arrowscrollbox' +
' > scrollbox' + ' > scrollbox' +
' > scrollbar[orient="vertical"] {' + ' > scrollbar[orient="vertical"] {' + rulesToSizeScrollbar + '}' +
' font-size: %SIZE%px;' +
'}' +
'tabs.tabbrowser-tabs[%MODE%="vertical"][%NARROW%="true"]' + 'tabs.tabbrowser-tabs[%MODE%="vertical"][%NARROW%="true"]' +
' .tabbrowser-arrowscrollbox' + ' .tabbrowser-arrowscrollbox' +
@ -554,7 +583,7 @@ var TreeStyleTabUtils = {
TreeStyleTabConstants.kOVERRIDE_SYSTEM_SCROLLBAR_APPEARANCE : '' ) TreeStyleTabConstants.kOVERRIDE_SYSTEM_SCROLLBAR_APPEARANCE : '' )
.replace(/%MODE%/g, TreeStyleTabConstants.kMODE) .replace(/%MODE%/g, TreeStyleTabConstants.kMODE)
.replace(/%NARROW%/g, TreeStyleTabConstants.kNARROW_SCROLLBAR) .replace(/%NARROW%/g, TreeStyleTabConstants.kNARROW_SCROLLBAR)
.replace(/%SIZE%/g, this.getTreePref('tabbar.narrowScrollbar.width')) .replace(/%SIZE%/g, size)
); );
this.lastAgentSheetForNarrowScrollbar = this.makeURIFromSpec(style); this.lastAgentSheetForNarrowScrollbar = this.makeURIFromSpec(style);
SSS.loadAndRegisterSheet(this.lastAgentSheetForNarrowScrollbar, SSS.AGENT_SHEET); SSS.loadAndRegisterSheet(this.lastAgentSheetForNarrowScrollbar, SSS.AGENT_SHEET);
@ -570,6 +599,7 @@ var TreeStyleTabUtils = {
' border: 1px solid ThreeDShadow;' + ' border: 1px solid ThreeDShadow;' +
'}', '}',
lastAgentSheetForNarrowScrollbar : null, lastAgentSheetForNarrowScrollbar : null,
lastOriginalScrollbarSize : 0,