From 39c834b83f9d97bc21aa27c85e7a7f5592f67c2d Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Wed, 17 May 2023 08:13:05 +1000 Subject: [PATCH] [v3 mac] DisableWindowShadow -> DisableShadow --- v3/STATUS.md | 16 ++++++++-------- v3/examples/window/main.go | 2 +- v3/pkg/application/options_mac.go | 2 +- v3/pkg/application/webview_window_darwin.go | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/v3/STATUS.md b/v3/STATUS.md index 6cd014688..7b0883c40 100644 --- a/v3/STATUS.md +++ b/v3/STATUS.md @@ -32,7 +32,7 @@ Webview Window Interface Methods | close() | | | Y | | | destroy() | | | Y | | | execJS(js string) | | | Y | | -| focus() | Y | | | | +| focus() | Y | | Y | | | forceReload() | | | Y | | | fullscreen() | Y | | Y | | | getScreen() (*Screen, error) | | | Y | | @@ -126,7 +126,7 @@ Webview Window Interface Methods | Size | Y | | Y | | | SetPosition | Y | | Y | | | Position | Y | | Y | | -| Focus | Y | | | | +| Focus | Y | | Y | | | FullScreen | Y | | Y | | | UnFullscreen | Y | | Y | | | Minimise | Y | | Y | | @@ -286,12 +286,12 @@ Built-in plugin support: ### Mac Options -| Feature | Default | Notes | -|-------------------------|-------------------|------------------------------------------------------| -| Backdrop | MacBackdropNormal | Standard solid window | -| DisableWindowShadow | false | | -| TitleBar | | Standard window decorations by default | -| Appearance | DefaultAppearance | | +| Feature | Default | Notes | +|-------------------|-------------------|------------------------------------------------------| +| Backdrop | MacBackdropNormal | Standard solid window | +| DisableShadow | false | | +| TitleBar | | Standard window decorations by default | +| Appearance | DefaultAppearance | | | InvisibleTitleBarHeight | 0 | Creates an invisible title bar for frameless windows | diff --git a/v3/examples/window/main.go b/v3/examples/window/main.go index 50a8aa345..e44d722ec 100644 --- a/v3/examples/window/main.go +++ b/v3/examples/window/main.go @@ -275,7 +275,7 @@ func main() { }) app.NewWebviewWindowWithOptions(application.WebviewWindowOptions{ Mac: application.MacWindow{ - DisableWindowShadow: true, + DisableShadow: true, }, }) diff --git a/v3/pkg/application/options_mac.go b/v3/pkg/application/options_mac.go index 8e852b17b..109071021 100644 --- a/v3/pkg/application/options_mac.go +++ b/v3/pkg/application/options_mac.go @@ -44,7 +44,7 @@ const ( // MacWindow contains macOS specific options type MacWindow struct { Backdrop MacBackdrop - DisableWindowShadow bool + DisableShadow bool TitleBar MacTitleBar Appearance MacAppearanceType InvisibleTitleBarHeight int diff --git a/v3/pkg/application/webview_window_darwin.go b/v3/pkg/application/webview_window_darwin.go index 9c6f64c08..d5b316d92 100644 --- a/v3/pkg/application/webview_window_darwin.go +++ b/v3/pkg/application/webview_window_darwin.go @@ -820,7 +820,7 @@ type macosWebviewWindow struct { } func (w *macosWebviewWindow) focus() { - //TODO implement me + w.show() } func (w *macosWebviewWindow) openContextMenu(menu *Menu, data *ContextMenuData) { @@ -1176,12 +1176,12 @@ func (w *macosWebviewWindow) run() { } if w.parent.options.Hidden == false { C.windowShow(w.nsWindow) - w.setHasShadow(!w.parent.options.Mac.DisableWindowShadow) + w.setHasShadow(!w.parent.options.Mac.DisableShadow) } else { // We have to wait until the window is shown before we can remove the shadow var cancel func() cancel = w.parent.On(events.Mac.WindowDidBecomeKey, func(_ *WindowEventContext) { - w.setHasShadow(!w.parent.options.Mac.DisableWindowShadow) + w.setHasShadow(!w.parent.options.Mac.DisableShadow) cancel() }) }