added new method set_window_icon for macos, windows, html5 platform #71

AGulev · 2018-02-28T14:05:11Z

No description provided.

subsoap

Tested for bundled Windows and HTML5

dapetcu21 · 2018-02-28T18:21:39Z

Why not accept an absolute path into that function? (on macOS) That way it can be consistent with set_mouse_cursor (and could be made to work when not bundled).

What's really missing, though, is a function to get the absolute path to the bundle root. I made something similar here: https://github.com/dapetcu21/defold-fmod/blob/master/bridge/src/fmod_dynamic_loading.cpp#L76

dapetcu21 · 2018-02-28T18:24:25Z

I see that for HTML5 and Windows you're passing the path directly and it would be relative to the current directory, which is not guaranteed to be the same as the directory containing your executable.

AGulev · 2018-02-28T18:27:37Z

I saw how did you work with cursor, and I don't' want to work this way with icon.
Icon it's something static. Something that developer want to have when game started.

dapetcu21 · 2018-02-28T18:32:48Z

Yes, yet it's confusing to be using absolute paths in one place and relative paths in another place. Furthermore, on Windows the path is not even relative to the right thing. You want it to be relative to the game's .exe, not to the current directory.

AGulev · 2018-02-28T18:34:53Z

how do you propose to fix that?

dapetcu21 · 2018-02-28T18:37:30Z

Add a get_bundle_root() function that would get you the absolute path to the:

directory containing the .exe on Windows
.app bundle on macOS

(see what I linked above)

AGulev · 2018-02-28T18:38:20Z

I like this solution, I'll implement it soon

dapetcu21 · 2018-02-28T18:40:26Z

You should also add a defos.PATH_SEP that is set to "\" on Windows and "/" everywhere else so that users can do
defos.get_bundle_root() .. defos.PATH_SEP .. icons[system_name]

AGulev · 2018-02-28T18:46:11Z

I can return path already with separator

dapetcu21 · 2018-02-28T18:46:14Z

defos/src/defos_mac.mm

+void defos_set_window_icon(const char *icon_path)
+{
+    NSString *bundlePath = [[NSBundle mainBundle] resourcePath];
+    NSString *secondParentPath = [[bundlePath stringByDeletingLastPathComponent] stringByDeletingLastPathComponent];


You could have gotten to this in a more easier way:

[[NSBundle mainBundle] bundlePath]

dapetcu21 · 2018-02-28T18:47:31Z

Please don't return it with separator. The user might want to use it for something else as well. And they might want to compose their own path, so having the separator separately is helpful.

AGulev · 2018-03-04T16:46:19Z

@dapetcu21 done.
Maybe you know why I receive an error:

when I try to use free() method?
#include <stdlib.h> - didn't help

dapetcu21 · 2018-03-06T16:01:34Z

free() won't work in that context because you're trying to free a const char*, which cannot be converted to void *, which is what free() wants. You need to drop the const.

dapetcu21 · 2018-03-06T15:45:05Z

defos/src/defos_html5.cpp

+        document.head || (document.head = document.getElementsByTagName('head')[0]);
+        function changeFavicon(src) {
+            var link = document.createElement('link');
+            var oldLink = document.getElementById('dynamic-favicon');


If the user has a <link rel='shortcut icon'> already in the document that wasn't inserted by defos, he'll end up having two <link>'s. Maybe do var oldLink = document.querySelector('link[rel="shortcut icon"]')?

dapetcu21 · 2018-03-06T15:48:40Z

defos/src/defos_html5.cpp

+        stringToUTF8(jsString, stringOnWasmHeap, lengthBytes+1);
+        return stringOnWasmHeap;
+    },0);
+    return bundlePath;


This leaks the bundlePath string after it gets passed to Lua in get_bundle_root(). Maybe always make sure we return a string we own and free() it in get_bundle_root()?

I wanted to do this (I asked you aboutt free()), it was my fault with const, thx!

dapetcu21 · 2018-03-06T15:50:33Z

defos/src/defos_mac.mm

+void defos_set_window_icon(const char *icon_path)
+{
+    NSString *path = [NSString stringWithUTF8String:icon_path];
+    NSImage* image = [[NSImage alloc] initWithContentsOfFile: path];


This image leaks. It needs to be released after giving it to the window button.

dapetcu21 · 2018-03-06T15:52:37Z

defos/src/defos_win.cpp

+char const* defos_get_bundle_root() {
+    char bundlePath[MAX_PATH];
+    GetCurrentDirectory(MAX_PATH, bundlePath);
+    return bundlePath;


You're returning a reference to a string on the stack, which will be invalid memory after this function returns. Allocate memory for the string and make sure it gets freed after passing it to Lua

dapetcu21 · 2018-03-06T15:56:34Z

defos/src/defos_mac.mm

@@ -93,6 +93,20 @@ void defos_set_window_title(const char* title_lua) {
    [window setTitle:title];
 }

+void defos_set_window_icon(const char *icon_path)
+{
+    NSString *path = [NSString stringWithUTF8String:icon_path];


This string gets created and autoreleased, meaning it will get garbage collected by the nearest autorelease pool. We don't know how Defold works internally, so we don't know if it has an autorelease pool in all contexts this function might get called. It would be safest to surround this with an @autorelease { ... }.

ok, i'll do this. thx.
I think Defold has no autorelease pool in all context, i found this issue with other my NE :
https://forum.defold.com/t/native-extensions/4946/149?u=agulev

dapetcu21 · 2018-03-06T15:58:14Z

defos/src/defos_mac.mm

+char const* defos_get_bundle_root() {
+    NSString *bundlePath = [[NSBundle mainBundle] bundlePath];
+    const char *bundlePath_lua = [bundlePath UTF8String];
+    return bundlePath_lua;


This is fine. It won't leak since it's owned by the bundle, but if we add a free() in get_bundle_root() as I suggested for HTML and Windows, we should copy this string into some memory we own.

try to find <link> in html5 realisation before creation of new icon

added new method set_window_icon for macos, windows, html5 platform

89e9b9a

AGulev requested review from subsoap and dapetcu21 February 28, 2018 14:05

remove unneed slash

5595d4e

subsoap approved these changes Feb 28, 2018

View reviewed changes

dapetcu21 reviewed Feb 28, 2018

View reviewed changes

fixes for working with true relative path

136c5ce

dapetcu21 requested changes Mar 6, 2018

View reviewed changes

AGulev added 2 commits March 6, 2018 20:24

memory leak bug fixing

0b3dfcd

try to find <link> in html5 realisation before creation of new icon

new js method changeFavicon

50c6c41

AGulev merged commit 1a3a4a4 into subsoap:master Mar 6, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

added new method set_window_icon for macos, windows, html5 platform #71

added new method set_window_icon for macos, windows, html5 platform #71

AGulev commented Feb 28, 2018

subsoap left a comment

dapetcu21 commented Feb 28, 2018 •

edited

Loading

dapetcu21 commented Feb 28, 2018

AGulev commented Feb 28, 2018 •

edited

Loading

dapetcu21 commented Feb 28, 2018

AGulev commented Feb 28, 2018

dapetcu21 commented Feb 28, 2018 •

edited

Loading

AGulev commented Feb 28, 2018

dapetcu21 commented Feb 28, 2018 •

edited

Loading

AGulev commented Feb 28, 2018

dapetcu21 Feb 28, 2018

AGulev Mar 1, 2018

dapetcu21 commented Feb 28, 2018 •

edited

Loading

AGulev commented Mar 4, 2018

dapetcu21 commented Mar 6, 2018

dapetcu21 Mar 6, 2018

AGulev Mar 6, 2018

dapetcu21 Mar 6, 2018

AGulev Mar 6, 2018 •

edited

Loading

AGulev Mar 6, 2018

dapetcu21 Mar 6, 2018

AGulev Mar 6, 2018

dapetcu21 Mar 6, 2018

AGulev Mar 6, 2018

dapetcu21 Mar 6, 2018

AGulev Mar 6, 2018 •

edited

Loading

AGulev Mar 6, 2018

dapetcu21 Mar 6, 2018

AGulev Mar 6, 2018

added new method set_window_icon for macos, windows, html5 platform #71

added new method set_window_icon for macos, windows, html5 platform #71

Conversation

AGulev commented Feb 28, 2018

subsoap left a comment

Choose a reason for hiding this comment

dapetcu21 commented Feb 28, 2018 • edited Loading

dapetcu21 commented Feb 28, 2018

AGulev commented Feb 28, 2018 • edited Loading

dapetcu21 commented Feb 28, 2018

AGulev commented Feb 28, 2018

dapetcu21 commented Feb 28, 2018 • edited Loading

AGulev commented Feb 28, 2018

dapetcu21 commented Feb 28, 2018 • edited Loading

AGulev commented Feb 28, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dapetcu21 commented Feb 28, 2018 • edited Loading

AGulev commented Mar 4, 2018

dapetcu21 commented Mar 6, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AGulev Mar 6, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AGulev Mar 6, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dapetcu21 commented Feb 28, 2018 •

edited

Loading

AGulev commented Feb 28, 2018 •

edited

Loading

dapetcu21 commented Feb 28, 2018 •

edited

Loading

dapetcu21 commented Feb 28, 2018 •

edited

Loading

dapetcu21 commented Feb 28, 2018 •

edited

Loading

AGulev Mar 6, 2018 •

edited

Loading

AGulev Mar 6, 2018 •

edited

Loading