github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-03 00:09:56 +08:00
Code Projects Activity

[linux] Support closing window, hide window on close.

Browse Source
This commit is contained in:
Lea Anthony 2021-12-01 20:31:23 +11:00
parent 1cd2645b87
commit 4bc0b30231
No known key found for this signature in database
GPG Key ID: 33DAF7BB90A58405
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,12 +144,24 @@ void connectButtons(void* webview, ulong* pressed, ulong* released) {
extern void processURLRequest(WebKitURISchemeRequest *request); extern void processURLRequest(WebKitURISchemeRequest *request);
GtkWidget* setupWebview(void* contentManager, GtkWindow* window) { // This is called when the close button on the window is pressed
gboolean close_button_pressed(GtkWidget *widget, GdkEvent *event, void*)
{
gtk_main_quit();
return TRUE;
}
GtkWidget* setupWebview(void* contentManager, GtkWindow* window, int hideWindowOnClose) {
GtkWidget* webview = webkit_web_view_new_with_user_content_manager((WebKitUserContentManager*)contentManager); GtkWidget* webview = webkit_web_view_new_with_user_content_manager((WebKitUserContentManager*)contentManager);
gtk_container_add(GTK_CONTAINER(window), webview); gtk_container_add(GTK_CONTAINER(window), webview);
WebKitWebContext *context = webkit_web_context_get_default(); WebKitWebContext *context = webkit_web_context_get_default();
webkit_web_context_register_uri_scheme(context, "wails", (WebKitURISchemeRequestCallback)processURLRequest, NULL, NULL); webkit_web_context_register_uri_scheme(context, "wails", (WebKitURISchemeRequestCallback)processURLRequest, NULL, NULL);
//g_signal_connect(G_OBJECT(webview), "load-changed", G_CALLBACK(webview_load_changed_cb), NULL); //g_signal_connect(G_OBJECT(webview), "load-changed", G_CALLBACK(webview_load_changed_cb), NULL);
if (hideWindowOnClose) {
g_signal_connect(GTK_WIDGET(window), "delete-event", G_CALLBACK(gtk_widget_hide_on_delete), NULL);
} else {
g_signal_connect(GTK_WIDGET(window), "delete-event", G_CALLBACK(close_button_pressed), NULL);
}
return webview; return webview;
} }
@ -197,6 +209,13 @@ type Window struct {
signalMouseReleased C.ulong signalMouseReleased C.ulong
} }
func bool2Cint(value bool) C.int {
if value {
return C.int(1)
}
return C.int(0)
}
func NewWindow(appoptions *options.App, debug bool) *Window { func NewWindow(appoptions *options.App, debug bool) *Window {
result := &Window{ result := &Window{
@ -214,7 +233,7 @@ func NewWindow(appoptions *options.App, debug bool) *Window {
C.webkit_user_content_manager_register_script_message_handler(result.cWebKitUserContentManager(), external) C.webkit_user_content_manager_register_script_message_handler(result.cWebKitUserContentManager(), external)
result.signalInvoke = C.setupInvokeSignal(result.contentManager) result.signalInvoke = C.setupInvokeSignal(result.contentManager)
webview := C.setupWebview(result.contentManager, result.asGTKWindow()) webview := C.setupWebview(result.contentManager, result.asGTKWindow(), bool2Cint(appoptions.HideWindowOnClose))
result.webview = unsafe.Pointer(webview) result.webview = unsafe.Pointer(webview)
buttonPressedName := C.CString("button-press-event") buttonPressedName := C.CString("button-press-event")
defer C.free(unsafe.Pointer(buttonPressedName)) defer C.free(unsafe.Pointer(buttonPressedName))
@ -248,11 +267,6 @@ func (w *Window) cWebKitUserContentManager() *C.WebKitUserContentManager {
return (*C.WebKitUserContentManager)(w.contentManager) return (*C.WebKitUserContentManager)(w.contentManager)
} }
//func (w *Window) Dispatch(f func()) {
// glib.IdleAdd(f)
//}
//
func (w *Window) Fullscreen() { func (w *Window) Fullscreen() {
C.gtk_window_fullscreen(w.asGTKWindow()) C.gtk_window_fullscreen(w.asGTKWindow())
} }
@ -263,7 +277,7 @@ func (w *Window) UnFullscreen() {
func (w *Window) Destroy() { func (w *Window) Destroy() {
// Destroy signal handlers // Destroy signal handlers
C.g_signal_handler_disconnect((C.gpointer)(w.contentManager), w.signalInvoke) //C.g_signal_handler_disconnect((C.gpointer)(w.contentManager), w.signalInvoke)
//TODO: Proper shutdown //TODO: Proper shutdown
C.g_object_unref(C.gpointer(w.gtkWindow)) C.g_object_unref(C.gpointer(w.gtkWindow))
@ -363,6 +377,7 @@ func (w *Window) Run() {
w.Maximise() w.Maximise()
} }
C.gtk_main() C.gtk_main()
w.Destroy()
} }
func (w *Window) SetKeepAbove(top bool) { func (w *Window) SetKeepAbove(top bool) {
@ -398,6 +413,5 @@ func (w *Window) StartDrag() {
} }
func (w *Window) Quit() { func (w *Window) Quit() {
w.Close() C.gtk_main_quit()
w.Destroy()
} }