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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anna Kozlova
2013-01-31 16:26:43 +04:00
parent eb186539e8 e67beae2f1
commit 18a2a3d250
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/src/com/intellij/util/ImageLoader.java
+16 -2
View File
@@ -71,6 +71,18 @@ public class ImageLoader implements Serializable {
return null;
}
@Nullable
public static Image loadFromUrl(URL url, boolean dark, boolean retina) {
for (Pair<String, Integer> each : getFileNames(url.toString(), dark, retina)) {
try {
return loadFromStream(URLUtil.openStream(new URL(each.first)), each.second);
}
catch (IOException ignore) {
}
}
return null;
}
@Nullable
public static Image loadFromResource(@NonNls String s) {
int stackFrameCount = 2;
@@ -96,8 +108,10 @@ public class ImageLoader implements Serializable {
}
public static List<Pair<String, Integer>> getFileNames(@NotNull String file) {
final boolean dark = UIUtil.isUnderDarcula();
final boolean retina = UIUtil.isRetina();
return getFileNames(file, UIUtil.isUnderDarcula(), UIUtil.isRetina());
}
public static List<Pair<String, Integer>> getFileNames(@NotNull String file, boolean dark, boolean retina) {
if (retina || dark) {
List<Pair<String, Integer>> answer = new ArrayList<Pair<String, Integer>>(4);