github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-02 19:31:20 +08:00
Code Projects Activity

[linux] execute JS on main thread

Browse Source
This commit is contained in:
Travis McLane 2022-01-18 21:31:08 -06:00
parent e96410e714
commit cfcc6cfa1c
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
v2/internal/frontend/desktop/linux/window.go
View File

@ -184,6 +184,21 @@ static void startDrag(void *webview, GtkWindow* mainwindow)
gtk_window_begin_move_drag(mainwindow, 1, xroot, yroot, dragTime); gtk_window_begin_move_drag(mainwindow, 1, xroot, yroot, dragTime);
} }
typedef struct JSCallback {
void* webview;
char* script;
} JSCallback;
int executeJS(gpointer data) {
struct JSCallback *js = data;
webkit_web_view_run_javascript(js->webview, js->script, NULL, NULL, NULL);
free(js->script);
return G_SOURCE_REMOVE;
}
void ExecuteOnMainThread(JSCallback* jscallback) {
g_idle_add((GSourceFunc)executeJS, (gpointer)jscallback);
}
*/ */
import "C" import "C"
import ( import (
@ -396,9 +411,11 @@ func (w *Window) SetTitle(title string) {
} }
func (w *Window) ExecJS(js string) { func (w *Window) ExecJS(js string) {
script := C.CString(js) jscallback := C.JSCallback{
defer C.free(unsafe.Pointer(script)) webview: w.webview,
C.webkit_web_view_run_javascript((*C.WebKitWebView)(w.webview), script, nil, nil, nil) script: C.CString(js),
}
C.ExecuteOnMainThread(&jscallback)
} }
func (w *Window) StartDrag() { func (w *Window) StartDrag() {