* pre-loading of images didn't work.
* "default" style didn't work correctly (it worked just same as "flat".)
This commit is contained in:
parent
e8ad95487a
commit
69f78feafb
@ -35,6 +35,8 @@
|
|||||||
|
|
||||||
const EXPORTED_SYMBOLS = ['TreeStyleTabThemeManager'];
|
const EXPORTED_SYMBOLS = ['TreeStyleTabThemeManager'];
|
||||||
|
|
||||||
|
const BASE = 'chrome://treestyletab/skin/';
|
||||||
|
|
||||||
Components.utils.import('resource://treestyletab-modules/utils.js');
|
Components.utils.import('resource://treestyletab-modules/utils.js');
|
||||||
|
|
||||||
function TreeStyleTabThemeManager(aWindow)
|
function TreeStyleTabThemeManager(aWindow)
|
||||||
@ -57,13 +59,12 @@ TreeStyleTabThemeManager.prototype = {
|
|||||||
});
|
});
|
||||||
this._lastStyles = null;
|
this._lastStyles = null;
|
||||||
|
|
||||||
const BASE = 'chrome://treestyletab/skin/';
|
|
||||||
|
|
||||||
var styles = [];
|
var styles = [];
|
||||||
switch (aStyle)
|
switch (aStyle)
|
||||||
{
|
{
|
||||||
case 'default':
|
case 'default':
|
||||||
default:
|
default:
|
||||||
|
break;
|
||||||
|
|
||||||
case 'flat':
|
case 'flat':
|
||||||
styles.push(BASE+'square/base.css');
|
styles.push(BASE+'square/base.css');
|
||||||
@ -127,7 +128,7 @@ TreeStyleTabThemeManager.prototype = {
|
|||||||
return;
|
return;
|
||||||
this._preLoadImagesForStyleDone.push(key);
|
this._preLoadImagesForStyleDone.push(key);
|
||||||
|
|
||||||
var images = aStyle in this._preLoadImages ?
|
var images = key in this._preLoadImages ?
|
||||||
this._preLoadImages[key] :
|
this._preLoadImages[key] :
|
||||||
null ;
|
null ;
|
||||||
if (!images) return;
|
if (!images) return;
|
||||||
@ -143,36 +144,36 @@ TreeStyleTabThemeManager.prototype = {
|
|||||||
|
|
||||||
_preLoadImages : {
|
_preLoadImages : {
|
||||||
'metal-left' : [
|
'metal-left' : [
|
||||||
'chrome://treestyletab/skin/metal/tab-active-l.png',
|
BASE+'metal/tab-active-l.png',
|
||||||
'chrome://treestyletab/skin/metal/tab-inactive-l.png',
|
BASE+'metal/tab-inactive-l.png',
|
||||||
'chrome://treestyletab/skin/metal/tab-active-selected-l.png',
|
BASE+'metal/tab-active-selected-l.png',
|
||||||
'chrome://treestyletab/skin/metal/tab-inactive-selected-l.png',
|
BASE+'metal/tab-inactive-selected-l.png',
|
||||||
'chrome://treestyletab/skin/metal/shadow-active-l.png',
|
BASE+'metal/shadow-active-l.png',
|
||||||
'chrome://treestyletab/skin/metal/shadow-inactive-l.png'
|
BASE+'metal/shadow-inactive-l.png'
|
||||||
].concat(
|
].concat(
|
||||||
TreeStyleTabUtils.Comparator.compare(TreeStyleTabUtils.XULAppInfo.version, '3.5') >= 0 ?
|
TreeStyleTabUtils.Comparator.compare(TreeStyleTabUtils.XULAppInfo.version, '3.5') >= 0 ?
|
||||||
[
|
[
|
||||||
'chrome://treestyletab/skin/metal/tab-active-middle.png',
|
BASE+'metal/tab-active-middle.png',
|
||||||
'chrome://treestyletab/skin/metal/tab-active-middle-selected.png',
|
BASE+'metal/tab-active-middle-selected.png',
|
||||||
'chrome://treestyletab/skin/metal/tab-inactive-middle.png',
|
BASE+'metal/tab-inactive-middle.png',
|
||||||
'chrome://treestyletab/skin/metal/tab-inactive-middle-selected.png'
|
BASE+'metal/tab-inactive-middle-selected.png'
|
||||||
] :
|
] :
|
||||||
[]
|
[]
|
||||||
),
|
),
|
||||||
'metal-right' : [
|
'metal-right' : [
|
||||||
'chrome://treestyletab/skin/metal/tab-active-r.png',
|
BASE+'metal/tab-active-r.png',
|
||||||
'chrome://treestyletab/skin/metal/tab-inactive-r.png',
|
BASE+'metal/tab-inactive-r.png',
|
||||||
'chrome://treestyletab/skin/metal/tab-active-selected-r.png',
|
BASE+'metal/tab-active-selected-r.png',
|
||||||
'chrome://treestyletab/skin/metal/tab-inactive-selected-r.png',
|
BASE+'metal/tab-inactive-selected-r.png',
|
||||||
'chrome://treestyletab/skin/metal/shadow-active-r.png',
|
BASE+'metal/shadow-active-r.png',
|
||||||
'chrome://treestyletab/skin/metal/shadow-inactive-r.png'
|
BASE+'metal/shadow-inactive-r.png'
|
||||||
].concat(
|
].concat(
|
||||||
TreeStyleTabUtils.Comparator.compare(TreeStyleTabUtils.XULAppInfo.version, '3.5') >= 0 ?
|
TreeStyleTabUtils.Comparator.compare(TreeStyleTabUtils.XULAppInfo.version, '3.5') >= 0 ?
|
||||||
[
|
[
|
||||||
'chrome://treestyletab/skin/metal/tab-active-middle.png',
|
BASE+'metal/tab-active-middle.png',
|
||||||
'chrome://treestyletab/skin/metal/tab-active-middle-selected.png',
|
BASE+'metal/tab-active-middle-selected.png',
|
||||||
'chrome://treestyletab/skin/metal/tab-inactive-middle.png',
|
BASE+'metal/tab-inactive-middle.png',
|
||||||
'chrome://treestyletab/skin/metal/tab-inactive-middle-selected.png'
|
BASE+'metal/tab-inactive-middle-selected.png'
|
||||||
] :
|
] :
|
||||||
[]
|
[]
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user