diff options
| author | Dan Gudmundsson <[email protected]> | 2019-01-25 12:47:33 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-01-25 12:47:33 +0100 |
| commit | 839b3dfc6295a9bbfb42a9af8820c9e580beaea2 (patch) | |
| tree | 42e46080064d2c9ce4e426a34c84e11aa2c7f68f | |
| parent | b94a5a7ccc4c04ea2eabd56e4a5eb54895327d8b (diff) | |
| parent | c2410f4b43606f4523acc648308daf5d18f2e253 (diff) | |
| download | otp-839b3dfc6295a9bbfb42a9af8820c9e580beaea2.tar.gz otp-839b3dfc6295a9bbfb42a9af8820c9e580beaea2.tar.bz2 otp-839b3dfc6295a9bbfb42a9af8820c9e580beaea2.zip | |
Merge pull request #2094 from jfacorro/change-application-icon-mac-os-x
Enable a way to change the application icon for Mac OS X in wx
| -rw-r--r-- | lib/wx/c_src/Makefile.in | 1 | ||||
| -rw-r--r-- | lib/wx/c_src/wxe_ps_init.c | 14 |
2 files changed, 13 insertions, 2 deletions
diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in index daa8afce83..8ec64bea7e 100644 --- a/lib/wx/c_src/Makefile.in +++ b/lib/wx/c_src/Makefile.in @@ -181,6 +181,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/priv" $(INSTALL_DATA) ../priv/erlang-logo32.png "$(RELSYSDIR)/priv/" $(INSTALL_DATA) ../priv/erlang-logo64.png "$(RELSYSDIR)/priv/" + $(INSTALL_DATA) ../priv/erlang-logo128.png "$(RELSYSDIR)/priv/" $(INSTALL_PROGRAM) $(TARGET_DIR)/wxe_driver$(SO_EXT) "$(RELSYSDIR)/priv/" $(INSTALL_PROGRAM) $(TARGET_DIR)/erl_gl$(SO_EXT) "$(RELSYSDIR)/priv/" diff --git a/lib/wx/c_src/wxe_ps_init.c b/lib/wx/c_src/wxe_ps_init.c index 4b3b47a80b..62c7c51c13 100644 --- a/lib/wx/c_src/wxe_ps_init.c +++ b/lib/wx/c_src/wxe_ps_init.c @@ -64,6 +64,10 @@ void * wxe_ps_init2() { size_t app_len = 127; char app_title_buf[128]; char * app_title; + size_t app_icon_len = 1023; + char app_icon_buf[1024]; + char * app_icon; + // Setup and enable gui pool = [[NSAutoreleasePool alloc] init]; @@ -78,9 +82,15 @@ void * wxe_ps_init2() { if(!GetCurrentProcess(&psn)) { CPSSetProcessName(&psn, app_title?app_title:"Erlang"); } - // Load and set icon + // Enable setting custom application icon for Mac OS X + res = erl_drv_getenv("WX_APP_ICON", app_icon_buf, &app_icon_len); NSMutableString *file = [[NSMutableString alloc] init]; - [file appendFormat:@"%s/%s", erl_wx_privdir, "erlang-logo64.png"]; + if (res >= 0) { + [file appendFormat:@"%s", app_icon_buf]; + } else { + [file appendFormat:@"%s/%s", erl_wx_privdir, "erlang-logo128.png"]; + } + // Load and set icon NSImage *icon = [[NSImage alloc] initWithContentsOfFile: file]; [NSApp setApplicationIconImage: icon]; }; |