jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No Icons on Windows with locale other than en-US

Browse Source 
Reviewed By: mweststrate

Differential Revision: D18953063

fbshipit-source-id: d21116b11189851dff271fcfa7334a51b13c693f
This commit is contained in:
Anton Nikolaev
2019-12-12 03:59:57 -08:00
committed by Facebook Github Bot
parent 559285f5f9
commit c030cbe204
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/utils/icons.js
View File

@@ -98,13 +98,20 @@ function getIconPartsFromName(icon) {
return {trimmedName: trimmedName, variant: variant};
}
function getIconFileName(icon, size, density) {
return `${icon.trimmedName}-${icon.variant}-${size}@${density}x.png`;
}
// $FlowFixMe not using flow in this file
function buildLocalIconPath(name, size, density) {
const icon = getIconPartsFromName(name);
return path.join(
'icons',
`${icon.trimmedName}-${icon.variant}-${size}@${density}x.png`,
);
return path.join('icons', getIconFileName(icon, size, density));
}
// $FlowFixMe not using flow in this file
function buildLocalIconURL(name, size, density) {
const icon = getIconPartsFromName(name);
return `icons/${getIconFileName(icon, size, density)}`;
}
// $FlowFixMe not using flow in this file
@@ -168,13 +175,17 @@ module.exports = {
}
}
const localPath = buildLocalIconPath(name, size, density);
// resolve icon locally if possible
if (
remote &&
fs.existsSync(path.join(remote.app.getAppPath(), localPath))
fs.existsSync(
path.join(
remote.app.getAppPath(),
buildLocalIconPath(name, size, density),
),
)
) {
return localPath;
return buildLocalIconURL(name, size, density);
}
return buildIconURL(name, requestedSize, density);
},