From 2db902ef82c417ee6fb820d7d891be90a53dcf76 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Mon, 3 Feb 2025 20:33:59 +1100 Subject: [PATCH] Add menu option for Linux --- v3/pkg/application/webview_window_linux.go | 4 +--- v3/pkg/application/webview_window_options.go | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/v3/pkg/application/webview_window_linux.go b/v3/pkg/application/webview_window_linux.go index 68d0f21ea..4baf079d3 100644 --- a/v3/pkg/application/webview_window_linux.go +++ b/v3/pkg/application/webview_window_linux.go @@ -28,7 +28,6 @@ type linuxWebviewWindow struct { parent *WebviewWindow menubar pointer vbox pointer - menu *Menu accels pointer lastWidth int lastHeight int @@ -261,12 +260,11 @@ func (w *linuxWebviewWindow) run() { app := getNativeApplication() - var menu = w.menu + var menu = w.parent.options.Linux.Menu if menu != nil { InvokeSync(func() { menu.Update() }) - w.menu = menu w.gtkmenu = (menu.impl).(*linuxMenu).native } diff --git a/v3/pkg/application/webview_window_options.go b/v3/pkg/application/webview_window_options.go index 910c09022..04dae199e 100644 --- a/v3/pkg/application/webview_window_options.go +++ b/v3/pkg/application/webview_window_options.go @@ -530,4 +530,7 @@ type LinuxWindow struct { // WindowDidMoveDebounceMS is the debounce time in milliseconds for the WindowDidMove event WindowDidMoveDebounceMS uint16 + + // Menu is the window's menu + Menu *Menu }