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

Remove codes for "tabs in titlebar" #611

Browse Source
This commit is contained in:
Piro / YUKI Hiroshi 2013-11-29 01:22:18 +09:00
parent dce660e49d
commit a431551eed
4 changed files with 1 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/preferences/treestyletab.js
View File

@ -94,10 +94,6 @@ pref("extensions.treestyletab.platform.Linux.tabbar.style", "plain");
* Aero Glass will be applied for the vertical tab bar, if you set this to "true". * Aero Glass will be applied for the vertical tab bar, if you set this to "true".
*/ */
pref("extensions.treestyletab.tabbar.style.aero", false); pref("extensions.treestyletab.tabbar.style.aero", false);
/**
* Allow/disallow to show toolbox in the titlebar, for Australis.
*/
pref("extensions.treestyletab.toolbox.allowShowInTitlebar", true);
/** /**
* AutoHide style for the vertical tab bar. * AutoHide style for the vertical tab bar.

1
modules/constants.js
View File

@ -59,7 +59,6 @@ const TreeStyleTabConstants = Object.freeze({
kCOLLAPSING_PHASE_TO_BE_COLLAPSED : 'collapse', kCOLLAPSING_PHASE_TO_BE_COLLAPSED : 'collapse',
kCOLLAPSING_PHASE_TO_BE_EXPANDED : 'expand', kCOLLAPSING_PHASE_TO_BE_EXPANDED : 'expand',
kALLOW_COLLAPSE : 'treestyletab-allow-subtree-collapse', kALLOW_COLLAPSE : 'treestyletab-allow-subtree-collapse',
kALLOW_TOOLBOX_IN_TITLEBAR : 'treestyletab-allow-toolbox-in-titlebar',
kALLOW_STACK : 'treestyletab-stack-collapsed-tabs', kALLOW_STACK : 'treestyletab-stack-collapsed-tabs',
kREMOVED : 'treestyletab-removed', kREMOVED : 'treestyletab-removed',

22
modules/window.js
View File

@ -387,14 +387,12 @@ TreeStyleTabWindow.prototype = {
this.processRestoredTabs(); this.processRestoredTabs();
this.updateTabsOnTop(); this.updateTabsOnTop();
this.updateTabsInTitlebarForMenubar();
// Init autohide service only if it have to be activated. // Init autohide service only if it have to be activated.
if (this.isAutoHide) if (this.isAutoHide)
this.onPrefChange('extensions.treestyletab.tabbar.autoHide.mode'); this.onPrefChange('extensions.treestyletab.tabbar.autoHide.mode');
this.onPrefChange('extensions.treestyletab.autoCollapseExpandSubtreeOnSelect.whileFocusMovingByShortcut'); this.onPrefChange('extensions.treestyletab.autoCollapseExpandSubtreeOnSelect.whileFocusMovingByShortcut');
this.onPrefChange('extensions.treestyletab.toolbox.allowShowInTitlebar');
this.initialized = true; this.initialized = true;
}, },
@ -452,16 +450,6 @@ TreeStyleTabWindow.prototype = {
}, this); }, this);
}, },
updateTabsInTitlebarForMenubar : function TSTWindow_updateTabsInTitlebarForMenubar()
{
if (!this.window.TabsInTitlebar)
return;
var menubar = this.document.querySelector('#toolbar-menubar');
var menubarHidden = menubar && menubar.getAttribute('autohide') == 'true';
this.window.TabsInTitlebar.allowedBy('TreeStyleTab-menubar', menubarHidden);
},
initUIShowHideObserver : function TSTWindow_initUIShowHideObserver() initUIShowHideObserver : function TSTWindow_initUIShowHideObserver()
{ {
this.rootElementObserver = new BrowserUIShowHideObserver(this, this.document.documentElement); this.rootElementObserver = new BrowserUIShowHideObserver(this, this.document.documentElement);
@ -1052,11 +1040,7 @@ TreeStyleTabWindow.prototype = {
} }
} }
if (TabsInTitlebar) { if (TabsInTitlebar) {
let allowed = false; let allowed = isTopTabbar && this.browser.treeStyleTab.fixed;
if (isTopTabbar)
allowed = this.browser.treeStyleTab.fixed;
else
allowed = utils.getTreePref('toolbox.allowShowInTitlebar');
TabsInTitlebar.allowedBy('TreeStyleTab-tabsOnTop', allowed); TabsInTitlebar.allowedBy('TreeStyleTab-tabsOnTop', allowed);
} }
} }
@ -1703,10 +1687,6 @@ TreeStyleTabWindow.prototype = {
this.themeManager.set(prefs.getPref('extensions.treestyletab.tabbar.style'), this.position); this.themeManager.set(prefs.getPref('extensions.treestyletab.tabbar.style'), this.position);
break; break;
case 'extensions.treestyletab.toolbox.allowShowInTitlebar':
this.setTabbrowserAttribute(this.kALLOW_TOOLBOX_IN_TITLEBAR, value);
break;
case 'browser.ctrlTab.previews': case 'browser.ctrlTab.previews':
this.autoHideWindow.updateKeyListeners(this.window); this.autoHideWindow.updateKeyListeners(this.window);
case 'extensions.treestyletab.autoCollapseExpandSubtreeOnSelect.whileFocusMovingByShortcut': case 'extensions.treestyletab.autoCollapseExpandSubtreeOnSelect.whileFocusMovingByShortcut':

12
skin/classic/treestyletab/WINNT-base.css
View File

@ -26,18 +26,6 @@
-moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar-drag"); -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar-drag");
} }
/* show in titlebar mode */
#main-window[sizemode="normal"][tabsintitlebar="true"][treestyletab-allow-toolbox-in-titlebar="true"]:not([treestyletab-tabbar-position="top"])
#browser-panel
> #navigator-toolbox
> #nav-bar:not(:-moz-lwtheme),
#main-window[sizemode="normal"][tabsintitlebar="true"][treestyletab-allow-toolbox-in-titlebar="true"]:not([treestyletab-tabbar-position="top"])
#browser-panel
> #navigator-toolbox
> #nav-bar:not(:-moz-lwtheme):-moz-window-inactive {
margin-top: 1.5em;
}
} }