0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

fix #1067 (statistics: colors too similar in classic theme)

Browse source
This commit is contained in:
rolux 2012-10-09 08:26:04 +00:00
parent 93a9bcb92d
commit 9c3a354090
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
static/js/pandora/statisticsDialog.js
View file

@ -299,9 +299,7 @@ pandora.ui.statisticsDialog = function() {
(Math.abs(11.5 - parseInt(split[0], 10)) - 0.5) * -11, 1, 0.5 (Math.abs(11.5 - parseInt(split[0], 10)) - 0.5) * -11, 1, 0.5
); );
if (pandora.user.ui.theme == 'classic') { if (pandora.user.ui.theme == 'classic') {
color = color.map(function(c) { color = getColor(color);
return c - 64;
});
} }
return color; return color;
}, },
@ -354,9 +352,7 @@ pandora.ui.statisticsDialog = function() {
key == 'continent' ? value : value.split(', ')[1] key == 'continent' ? value : value.split(', ')[1]
); );
if (pandora.user.ui.theme == 'classic') { if (pandora.user.ui.theme == 'classic') {
color = color.map(function(c) { color = getColor(color);
return c - 64;
});
} }
return color; return color;
}, },
@ -445,9 +441,7 @@ pandora.ui.statisticsDialog = function() {
var name = version ? getName(value) : value, var name = version ? getName(value) : value,
color = colors[key][name]; color = colors[key][name];
if (pandora.user.ui.theme == 'classic') { if (pandora.user.ui.theme == 'classic') {
color = color.map(function(c) { color = getColor(color);
return c - 64;
});
} }
return color; return color;
}, },
@ -514,9 +508,7 @@ pandora.ui.statisticsDialog = function() {
return Math.round(Ox.sum(c) / 2); return Math.round(Ox.sum(c) / 2);
}); });
if (pandora.user.ui.theme == 'classic') { if (pandora.user.ui.theme == 'classic') {
color = color.map(function(c) { color = getColor(color);
return c - 64;
});
} }
return color; return color;
}, },
@ -603,6 +595,12 @@ pandora.ui.statisticsDialog = function() {
}); });
function getColor(color) {
var hsl = Ox.hsl(color);
hsl[2] = 0.4;
return Ox.rgb(hsl);
}
function getName(version) { function getName(version) {
var name = ''; var name = '';
Ox.forEach(names, function(v) { Ox.forEach(names, function(v) {