MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix path resolving for plugin icon

Browse Source 
GitOrigin-RevId: 05b808deee649ccd5454c61efbe2dc89caff377f
This commit is contained in:
Vladimir Krivosheev
2020-10-21 11:26:58 +00:00
committed by intellij-monorepo-bot
parent 72dcd6e64c
commit ceaa6c8e32
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginLogo.java
+11 -6
View File
@@ -35,7 +35,6 @@ import java.net.URL;
import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -126,10 +125,11 @@ public final class PluginLogo {
return icon;
}
if (!JBColor.isBright()) {
String path = URLUtil.urlToFile(url).getAbsolutePath();
if (path.endsWith(".svg") && !path.endsWith("_dark.svg")) {
Path darkFile = Paths.get(path.substring(0, path.length() - 4) + "_dark.svg");
try {
if (!JBColor.isBright() && url.getPath().endsWith(".svg") && !url.getPath().endsWith("_dark.svg")) {
Path file = URLUtil.urlToFile(url).toPath();
String fileName = file.getFileName().toString();
Path darkFile = file.getParent().resolve(fileName.substring(0, fileName.length() - 4) + "_dark.svg");
try (InputStream stream = Files.newInputStream(darkFile)) {
return HiDPIPluginLogoIcon.loadSVG(stream, width, height);
}
@@ -142,11 +142,16 @@ public final class PluginLogo {
}
}
}
catch (Exception e) {
if (logger != null) {
logger.warn(e);
}
}
try {
return HiDPIPluginLogoIcon.loadSVG(url.openStream(), width, height);
}
catch (IOException e) {
catch (Exception e) {
if (logger != null) {
logger.error(e);
}