From ba34e47c4b8bc9dfea881ba184be76bce07027a4 Mon Sep 17 00:00:00 2001 From: Travis McLane Date: Tue, 2 May 2023 11:43:28 -0500 Subject: [PATCH] [linux/purego] updates --- v3/pkg/application/menuitem_linux_purego.go | 2 +- .../webview_window_linux_purego.go | 21 +++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/v3/pkg/application/menuitem_linux_purego.go b/v3/pkg/application/menuitem_linux_purego.go index 9a8dae60e..f68273267 100644 --- a/v3/pkg/application/menuitem_linux_purego.go +++ b/v3/pkg/application/menuitem_linux_purego.go @@ -377,7 +377,7 @@ func newMinimizeMenuItem() *MenuItem { OnClick(func(ctx *Context) { currentWindow := globalApplication.CurrentWindow() if currentWindow != nil { - currentWindow.Minimize() + currentWindow.Minimise() } }) } diff --git a/v3/pkg/application/webview_window_linux_purego.go b/v3/pkg/application/webview_window_linux_purego.go index c9f581989..5a6f7beac 100644 --- a/v3/pkg/application/webview_window_linux_purego.go +++ b/v3/pkg/application/webview_window_linux_purego.go @@ -664,11 +664,7 @@ func (w *linuxWebviewWindow) setTransparent() { } } -func (w *linuxWebviewWindow) setBackgroundColour(colour *RGBA) { - if colour == nil { - return - } - +func (w *linuxWebviewWindow) setBackgroundColour(colour RGBA) { if colour.Alpha != 0 { w.setTransparent() } @@ -717,10 +713,23 @@ func (w *linuxWebviewWindow) destroy() { } func (w *linuxWebviewWindow) setHTML(html string) { - fmt.Println("setHTML") var loadHTML func(uintptr, string, string, *string) purego.RegisterLibFunc(&loadHTML, webkit, "webkit_web_view_load_alternate_html") go globalApplication.dispatchOnMainThread(func() { loadHTML(w.webview, html, "wails://", nil) }) } + +func (w *linuxWebviewWindow) isNormal() bool { + return !w.isMinimised() && !w.isMaximised() && !w.isFullscreen() +} + +func (w *linuxWebviewWindow) isVisible() bool { + var isVisible func(uintptr) bool + purego.RegisterLibFunc(&isVisible, gtk, "gtk_widget_is_visible") + return isVisible(w.window) +} + +func (w *linuxWebviewWindow) nativeWindowHandle() uintptr { + return w.window +}