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 [windows] do not override app icon

Browse Source
This commit is contained in:
Anton Tarasov
2017-11-16 16:33:27 +03:00
parent 23750feac6
commit c95b6517b9
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/WinLauncher/WinLauncher/WinLauncher.cpp
+3
View File
@@ -488,6 +488,9 @@ void AddPredefinedVMOptions(std::vector<std::string>& vmOptionLines)
{
vmOptionLines.push_back(std::string("-Didea.properties.file=") + propertiesFile);
}
std::stringstream id;
id << "-Djbre.win.app.icon.id=" << static_cast<int>(IDI_WINLAUNCHER);
vmOptionLines.push_back(id.str());
}
bool LoadVMOptions()
platform/platform-impl/src/com/intellij/ui/AppUIUtil.java
+6
View File
@@ -69,6 +69,12 @@ public class AppUIUtil {
private static boolean ourMacDocIconSet = false;
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
{
return; // JBRE will load icon from the exe resource
}
ApplicationInfoEx appInfo = ApplicationInfoImpl.getShadowInstance();
List<Image> images = ContainerUtil.newArrayListWithCapacity(3);