From 9da5df354ed8fc1cdf7c8074daeba080a70faf22 Mon Sep 17 00:00:00 2001 From: Travis McLane Date: Mon, 8 May 2023 12:08:54 -0500 Subject: [PATCH] make it compilable again --- v3/pkg/application/menuitem_linux.go | 10 ++++++++++ v3/pkg/application/menuitem_linux_purego.go | 10 ++++++++++ v3/pkg/application/systemtray_linux.go | 8 ++++++++ v3/pkg/application/webview_window_linux.go | 2 +- v3/pkg/application/webview_window_linux_purego.go | 2 +- 5 files changed, 30 insertions(+), 2 deletions(-) diff --git a/v3/pkg/application/menuitem_linux.go b/v3/pkg/application/menuitem_linux.go index 59b2bfaf8..d67a02729 100644 --- a/v3/pkg/application/menuitem_linux.go +++ b/v3/pkg/application/menuitem_linux.go @@ -395,3 +395,13 @@ func newZoomMenuItem() *MenuItem { } }) } + +func newFullScreenMenuItem() *MenuItem { + return newMenuItem("Fullscreen"). + OnClick(func(ctx *Context) { + currentWindow := globalApplication.CurrentWindow() + if currentWindow != nil { + currentWindow.Fullscreen() + } + }) +} diff --git a/v3/pkg/application/menuitem_linux_purego.go b/v3/pkg/application/menuitem_linux_purego.go index f68273267..be51f09e8 100644 --- a/v3/pkg/application/menuitem_linux_purego.go +++ b/v3/pkg/application/menuitem_linux_purego.go @@ -391,3 +391,13 @@ func newZoomMenuItem() *MenuItem { } }) } + +func newFullScreenMenuItem() *MenuItem { + return newMenuItem("Fullscreen"). + OnClick(func(ctx *Context) { + currentWindow := globalApplication.CurrentWindow() + if currentWindow != nil { + currentWindow.Fullscreen() + } + }) +} diff --git a/v3/pkg/application/systemtray_linux.go b/v3/pkg/application/systemtray_linux.go index 16008e630..8cc74460a 100644 --- a/v3/pkg/application/systemtray_linux.go +++ b/v3/pkg/application/systemtray_linux.go @@ -51,6 +51,14 @@ func (s *linuxSystemTray) setIcon(icon []byte) { }) } +func (s *linuxSystemTray) setDarkModeIcon(icon []byte) { + s.icon = icon + globalApplication.dispatchOnMainThread(func() { + // s.nsImage = unsafe.Pointer(C.imageFromBytes((*C.uchar)(&icon[0]), C.int(len(icon)))) + // C.systemTraySetIcon(s.nsStatusItem, s.nsImage, C.int(s.iconPosition), C.bool(s.isTemplateIcon)) + }) +} + func (s *linuxSystemTray) setTemplateIcon(icon []byte) { s.icon = icon s.isTemplateIcon = true diff --git a/v3/pkg/application/webview_window_linux.go b/v3/pkg/application/webview_window_linux.go index 04d4b9f6a..9834c9d1e 100644 --- a/v3/pkg/application/webview_window_linux.go +++ b/v3/pkg/application/webview_window_linux.go @@ -527,7 +527,7 @@ func newWindowImpl(parent *WebviewWindow) *linuxWebviewWindow { // (*C.struct__GtkWidget)(m.native) //var menubar *C.struct__GtkWidget return &linuxWebviewWindow{ - application: getNativeApplication(), + application: getNativeApplication().application, parent: parent, // menubar: menubar, } diff --git a/v3/pkg/application/webview_window_linux_purego.go b/v3/pkg/application/webview_window_linux_purego.go index bbca77525..11cc992c8 100644 --- a/v3/pkg/application/webview_window_linux_purego.go +++ b/v3/pkg/application/webview_window_linux_purego.go @@ -442,7 +442,7 @@ func (w *linuxWebviewWindow) setAlwaysOnTop(alwaysOnTop bool) { func newWindowImpl(parent *WebviewWindow) *linuxWebviewWindow { return &linuxWebviewWindow{ - application: getNativeApplication(), + application: getNativeApplication().application, parent: parent, } }