suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix non-HiDPI tag swatches when item type image is low-res

Browse Source
This commit is contained in:
Dan Stillman 2018-03-28 01:24:05 -04:00
parent 292a033c1a
commit 9ae582e345
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
chrome/content/zotero/xpcom/data/tags.js
View File

@ -758,12 +758,13 @@ Zotero.Tags = new function() {
* @return {Q Promise} A Q promise for a data: URL for a PNG * @return {Q Promise} A Q promise for a data: URL for a PNG
*/ */
this.generateItemsListImage = function (colors, extraImage) { this.generateItemsListImage = function (colors, extraImage) {
var multiplier = (extraImage && extraImage.indexOf('2x') != -1) ? 2 : 1; var multiplier = Zotero.hiDPI ? 2 : 1;
var swatchWidth = 8 * multiplier; var swatchWidth = 8 * multiplier;
var separator = 3 * multiplier; var separator = 3 * multiplier;
var extraImageSeparator = 1 * multiplier; var extraImageSeparator = 1 * multiplier;
var extraImageWidth = 16 * multiplier; var extraImageWidth = 16 * multiplier;
var extraImageHeight = 16 * multiplier;
var canvasHeight = 16 * multiplier; var canvasHeight = 16 * multiplier;
var swatchHeight = 8 * multiplier; var swatchHeight = 8 * multiplier;
var prependExtraImage = true; var prependExtraImage = true;
@ -831,7 +832,7 @@ Zotero.Tags = new function() {
// When extra image has loaded, draw it // When extra image has loaded, draw it
img.onload = function () { img.onload = function () {
ctx.drawImage(img, x, 0); ctx.drawImage(img, x, 0, extraImageWidth, extraImageHeight);
var dataURI = canvas.toDataURL("image/png"); var dataURI = canvas.toDataURL("image/png");
var dataURIPromise = Zotero.Promise.resolve(dataURI); var dataURIPromise = Zotero.Promise.resolve(dataURI);
@ -852,7 +853,7 @@ Zotero.Tags = new function() {
// for the composite image once it's ready // for the composite image once it's ready
return _itemsListExtraImagePromises[extraImage] return _itemsListExtraImagePromises[extraImage]
.then(function (img) { .then(function (img) {
ctx.drawImage(img, x, 0); ctx.drawImage(img, x, 0, extraImageWidth, extraImageHeight);
var dataURI = canvas.toDataURL("image/png"); var dataURI = canvas.toDataURL("image/png");
var dataURIPromise = Zotero.Promise.resolve(dataURI); var dataURIPromise = Zotero.Promise.resolve(dataURI);