Manage auto hide mode for each fullscreen window

This commit is contained in:
Piro / YUKI Hiroshi 2015-03-05 23:13:50 +09:00
parent 6bd9a7d20b
commit e0db926068

View File

@ -114,14 +114,22 @@ AutoHideBrowser.prototype = inherit(AutoHideConstants, {
return aValue; return aValue;
}, },
get lastMode() get lastNormalMode()
{ {
var lastMode = this.treeStyleTab.getWindowValue(this.kMODE) var lastMode = this.treeStyleTab.getWindowValue(this.kMODE + '-normal')
if (lastMode !== '') if (lastMode !== '')
return parseInt(lastMode); return parseInt(lastMode);
return utils.getTreePref('tabbar.autoHide.mode'); return utils.getTreePref('tabbar.autoHide.mode');
}, },
get lastFullscreenMode()
{
var lastMode = this.treeStyleTab.getWindowValue(this.kMODE + '-fullscreen')
if (lastMode !== '')
return parseInt(lastMode);
return utils.getTreePref('tabbar.autoHide.mode.fullscreen');
},
getMode : function AHB_getMode(aTabBrowser) getMode : function AHB_getMode(aTabBrowser)
{ {
@ -132,12 +140,12 @@ AutoHideBrowser.prototype = inherit(AutoHideConstants, {
getModeForNormal : function AHB_getModeForNormal(aTabBrowser) getModeForNormal : function AHB_getModeForNormal(aTabBrowser)
{ {
var b = aTabBrowser || this.browser; var b = aTabBrowser || this.browser;
return parseInt(b.getAttribute(this.kMODE+'-normal') || this.lastMode); return parseInt(b.getAttribute(this.kMODE+'-normal') || this.lastNormalMode);
}, },
getModeForFullScreen : function AHB_getModeForFullScreen(aTabBrowser) getModeForFullScreen : function AHB_getModeForFullScreen(aTabBrowser)
{ {
var b = aTabBrowser || this.browser; var b = aTabBrowser || this.browser;
return parseInt(b.getAttribute(this.kMODE+'-fullscreen') || utils.getTreePref('tabbar.autoHide.mode.fullscreen')); return parseInt(b.getAttribute(this.kMODE+'-fullscreen') || this.lastFullscreenMode);
}, },
get state() get state()
@ -162,7 +170,8 @@ AutoHideBrowser.prototype = inherit(AutoHideConstants, {
if (aNewMode === undefined) if (aNewMode === undefined)
aNewMode = this.mode; aNewMode = this.mode;
this.treeStyleTab.setWindowValue(this.kMODE, aNewMode); var suffix = this.treeStyleTab.isFullscreenAutoHide ? 'fullscreen' : 'normal' ;
this.treeStyleTab.setWindowValue(this.kMODE + '-suffix', aNewMode);
this.end(); this.end();
// update internal property after the appearance of the tab bar is updated. // update internal property after the appearance of the tab bar is updated.
@ -1366,8 +1375,8 @@ AutoHideBrowser.prototype = inherit(AutoHideConstants, {
this.showHideOnMouseMoveTimer = null; this.showHideOnMouseMoveTimer = null;
this.delayedShowForFeedbackTimer = null; this.delayedShowForFeedbackTimer = null;
b.setAttribute(this.kMODE+'-normal', this.lastMode); b.setAttribute(this.kMODE+'-normal', this.lastNormalMode);
b.setAttribute(this.kMODE+'-fullscreen', utils.getTreePref('tabbar.autoHide.mode.fullscreen')); b.setAttribute(this.kMODE+'-fullscreen', this.lastFullscreenMode);
prefs.addPrefListener(this); prefs.addPrefListener(this);
this.onPrefChange('browser.tabs.closeButtons'); this.onPrefChange('browser.tabs.closeButtons');
this.onPrefChange('extensions.treestyletab.tabbar.autoHide.area'); this.onPrefChange('extensions.treestyletab.tabbar.autoHide.area');
@ -1444,14 +1453,22 @@ AutoHideWindow.prototype = inherit(AutoHideConstants, {
return aValue; return aValue;
}, },
get lastMode() get lastNormalMode()
{ {
var lastMode = this.treeStyleTab.getWindowValue(this.kMODE); var lastMode = this.treeStyleTab.getWindowValue(this.kMODE + '-normal')
if (lastMode !== '') if (lastMode !== '')
return parseInt(lastMode); return parseInt(lastMode);
return utils.getTreePref('tabbar.autoHide.mode'); return utils.getTreePref('tabbar.autoHide.mode');
}, },
get lastFullscreenMode()
{
var lastMode = this.treeStyleTab.getWindowValue(this.kMODE + '-fullscreen')
if (lastMode !== '')
return parseInt(lastMode);
return utils.getTreePref('tabbar.autoHide.mode.fullscreen');
},
toggleMode : function AHW_toggleMode(aTabBrowser) /* PUBLIC API */ toggleMode : function AHW_toggleMode(aTabBrowser) /* PUBLIC API */
{ {
@ -1479,8 +1496,8 @@ AutoHideWindow.prototype = inherit(AutoHideConstants, {
restoreLastMode : function AHW_restoreLastMode() restoreLastMode : function AHW_restoreLastMode()
{ {
var mode = this.treeStyleTab.isFullscreenAutoHide ? var mode = this.treeStyleTab.isFullscreenAutoHide ?
utils.getTreePref('tabbar.autoHide.mode.fullscreen') : this.lastFullscreenMode :
this.lastMode; this.lastNormalMode;
if (mode == this.mode) if (mode == this.mode)
return; return;