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

IDEA-182266 [followup] [windows] do not override app icon

Browse Source
This commit is contained in:
Anton Tarasov
2017-11-28 16:20:15 +03:00
parent 5f3dfb2cf0
commit 9d675dd71e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/WinLauncher/WinLauncher/WinLauncher.rc
+1 -1
View File
@@ -153,7 +153,7 @@ END
STRINGTABLE
BEGIN
IDS_VM_OPTIONS "-Didea.jre.check=false"
IDS_VM_OPTIONS "-Didea.jre.check=false -Dide.native.launcher=true"
IDS_PROPS_ENV_VAR "IDEA_PROPERTIES"
IDS_VM_OPTIONS_ENV_VAR "IDEA_VM_OPTIONS"
IDS_ERROR_LAUNCHING_APP "Error Launching IntelliJ Platform"
platform/platform-impl/src/com/intellij/ui/AppUIUtil.java
+3 -3
View File
@@ -70,10 +70,10 @@ public class AppUIUtil {
public static void updateWindowIcon(@NotNull Window window) {
if (SystemInfo.isWindows &&
Integer.getInteger("jbre.win.app.icon.id") != null &&
SystemProperties.getBooleanProperty("jbre.win.app.icon.supported", false)) // set by JBRE
SystemProperties.getBooleanProperty("ide.native.launcher", false) &&
SystemProperties.getBooleanProperty("jbre.win.app.icon.supported", false)) // todo[tav] defined by JBRE, remove when OpenJDK supports it as well
{
return; // JBRE will load icon from the exe resource
return; // JDK will load icon from the exe resource
}
ApplicationInfoEx appInfo = ApplicationInfoImpl.getShadowInstance();
List<Image> images = ContainerUtil.newArrayListWithCapacity(3);