From 8efaaffadb58d8e5cc7f405bcc42e165b615209f Mon Sep 17 00:00:00 2001 From: Yong Hui Date: Fri, 15 Dec 2023 17:21:50 +0800 Subject: [PATCH] feat: add windows options supports `DisablePinchZoom` configuration(#2021) (#3115) * feat: add windows options supports `IsPinchZoomEnabled` configuration(#2021) * refactor: modify `IsPinchZoomEnabled` to `DisablePinchZoom` ensure default behavior is consistent * docs: add `DisablePinchZoom` to changelog * docs: update the description of `DisablePinchZoom` attributes in the document --------- Co-authored-by: Lea Anthony --- v2/internal/frontend/desktop/windows/frontend.go | 4 ++++ v2/pkg/options/windows/windows.go | 2 ++ website/docs/reference/options.mdx | 8 ++++++++ website/src/pages/changelog.mdx | 4 +++- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/v2/internal/frontend/desktop/windows/frontend.go b/v2/internal/frontend/desktop/windows/frontend.go index 7671ad742..97eef741f 100644 --- a/v2/internal/frontend/desktop/windows/frontend.go +++ b/v2/internal/frontend/desktop/windows/frontend.go @@ -543,6 +543,10 @@ func (f *Frontend) setupChromium() { if err != nil { log.Fatal(err) } + err = settings.PutIsPinchZoomEnabled(!opts.DisablePinchZoom) + if err != nil { + log.Fatal(err) + } } err = settings.PutIsStatusBarEnabled(false) diff --git a/v2/pkg/options/windows/windows.go b/v2/pkg/options/windows/windows.go index 073450c9f..39b91ee8d 100644 --- a/v2/pkg/options/windows/windows.go +++ b/v2/pkg/options/windows/windows.go @@ -68,6 +68,8 @@ type Options struct { IsZoomControlEnabled bool ZoomFactor float64 + DisablePinchZoom bool + // Disable all window decorations in Frameless mode, which means no "Aero Shadow" and no "Rounded Corner" will be shown. // "Rounded Corners" are only available on Windows 11. DisableFramelessWindowDecorations bool diff --git a/website/docs/reference/options.mdx b/website/docs/reference/options.mdx index caa2d0f80..d9a1ca4fc 100644 --- a/website/docs/reference/options.mdx +++ b/website/docs/reference/options.mdx @@ -70,6 +70,7 @@ func main() { WebviewIsTransparent: false, WindowIsTranslucent: false, BackdropType: windows.Mica, + DisablePinchZoom: false, DisableWindowIcon: false, DisableFramelessWindowDecorations: false, WebviewUserDataPath: "", @@ -577,6 +578,13 @@ The value can be one of the following: | Mica | Use [Mica](https://learn.microsoft.com/en-us/windows/apps/design/style/mica) effect | | Tabbed | Use Tabbed. This is a backdrop that is similar to Mica. | +#### DisablePinchZoom + +Setting this to `true` will disable pinch zoom gestures. + +Name: DisablePinchZoom
+Type: `bool` + #### DisableWindowIcon Setting this to `true` will remove the icon in the top left corner of the title bar. diff --git a/website/src/pages/changelog.mdx b/website/src/pages/changelog.mdx index 452b8c65e..44255428a 100644 --- a/website/src/pages/changelog.mdx +++ b/website/src/pages/changelog.mdx @@ -14,10 +14,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -### Changed +### Added +- Added windows options supports `DisablePinchZoom` configuration. Added by @tuuzed in [PR](https://github.com/wailsapp/wails/pull/3115) - Add Apple Silicon hardware detection to `wails doctor`. Changed by @almas1992 in [PR](https://github.com/wailsapp/wails/pull/3129) + ## v2.7.1 - 2023-12-10 ### Fixed