Merge branch 'master' into add-french-readme

wailsapp · Oct 3, 2023 · 56fc7b5 · 56fc7b5
2 parents a8a2afb + f6c82dc
commit 56fc7b5
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 4 deletions.
diff --git a/v2/internal/frontend/desktop/darwin/AppDelegate.m b/v2/internal/frontend/desktop/darwin/AppDelegate.m
@@ -17,7 +17,7 @@ - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender
 - (void)applicationWillFinishLaunching:(NSNotification *)aNotification {
     [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
     if (self.alwaysOnTop) {
-        [self.mainWindow setLevel:NSStatusWindowLevel];
+        [self.mainWindow setLevel:NSFloatingWindowLevel];
     }
     if ( !self.startHidden ) {
         [self.mainWindow makeKeyAndOrderFront:self];

diff --git a/v2/internal/frontend/desktop/darwin/WailsContext.h b/v2/internal/frontend/desktop/darwin/WailsContext.h
@@ -58,6 +58,7 @@
 struct Preferences {
   bool *tabFocusesLinks;
   bool *textInteractionEnabled;
+  bool *fullscreenEnabled;
 };
 
 - (void) CreateWindow:(int)width :(int)height :(bool)frameless :(bool)resizable :(bool)fullscreen :(bool)fullSizeContent :(bool)hideTitleBar :(bool)titlebarAppearsTransparent  :(bool)hideTitle :(bool)useToolbar :(bool)hideToolbarSeparator :(bool)webviewIsTransparent :(bool)hideWindowOnClose :(NSString *)appearance :(bool)windowIsTranslucent :(int)minWidth :(int)minHeight :(int)maxWidth :(int)maxHeight :(bool)fraudulentWebsiteWarningEnabled :(struct Preferences)preferences;

diff --git a/v2/internal/frontend/desktop/darwin/WailsContext.m b/v2/internal/frontend/desktop/darwin/WailsContext.m
@@ -224,6 +224,12 @@ - (void) CreateWindow:(int)width :(int)height :(bool)frameless :(bool)resizable
             config.preferences.textInteractionEnabled = *preferences.textInteractionEnabled;
         }
     }
+
+    if (@available(macOS 12.3, *)) {
+        if (preferences.fullscreenEnabled != NULL) {
+            config.preferences.elementFullscreenEnabled = *preferences.fullscreenEnabled;
+        }
+    }
 
 //    [config.preferences setValue:[NSNumber numberWithBool:true] forKey:@"developerExtrasEnabled"];
 
@@ -406,7 +412,7 @@ - (void) UnMaximise {
 
 - (void) SetAlwaysOnTop:(int)onTop {
     if (onTop) {
-        [self.mainWindow setLevel:NSStatusWindowLevel];
+        [self.mainWindow setLevel:NSFloatingWindowLevel];
     } else {
         [self.mainWindow setLevel:NSNormalWindowLevel];
     }

diff --git a/v2/internal/frontend/desktop/darwin/window.go b/v2/internal/frontend/desktop/darwin/window.go
@@ -95,6 +95,10 @@ func NewWindow(frontendOptions *options.App, debug bool, devtools bool) *Window
 			if mac.Preferences.TextInteractionEnabled.IsSet() {
 				preferences.textInteractionEnabled = bool2CboolPtr(mac.Preferences.TextInteractionEnabled.Get())
 			}
+
+			if mac.Preferences.FullscreenEnabled.IsSet() {
+				preferences.fullscreenEnabled = bool2CboolPtr(mac.Preferences.FullscreenEnabled.Get())
+			}
 		}
 
 		windowIsTranslucent = bool2Cint(mac.WindowIsTranslucent)

diff --git a/v2/pkg/options/mac/preferences.go b/v2/pkg/options/mac/preferences.go
@@ -13,4 +13,7 @@ type Preferences struct {
 	// A Boolean value that indicates whether to allow people to select or otherwise interact with text.
 	// Set to true by default.
 	TextInteractionEnabled u.Bool
+	// A Boolean value that indicates whether a web view can display content full screen.
+	// Set to false by default
+	FullscreenEnabled u.Bool
 }
diff --git a/website/docs/guides/troubleshooting.mdx b/website/docs/guides/troubleshooting.mdx
@@ -208,4 +208,8 @@ you can make the webview background transparent using the following config:
 If you have installed WebView2, but the `wails doctor` command shows that it is not installed, it is likely that the
 WebView2 runtime installed was for a different architecture. You can download the correct runtime from [here](https://developer.microsoft.com/en-us/microsoft-edge/webview2/).
 
-Source: https://github.com/wailsapp/wails/issues/2917
+Source: https://github.com/wailsapp/wails/issues/2917
+
+## WebVie2wProcess failed with kind
+
+If your Windows app generates this kind of error, you can check out what the error means [here](https://docs.microsoft.com/en-us/microsoft-edge/webview2/reference/winrt/microsoft_web_webview2_core/corewebview2processfailedkind?view=webview2-winrt-1.0.2045.28).
diff --git a/website/docs/reference/options.mdx b/website/docs/reference/options.mdx
@@ -812,13 +812,15 @@ You can specify the webview preferences.
 type Preferences struct {
 	TabFocusesLinks        u.Bool
 	TextInteractionEnabled u.Bool
+	FullscreenEnabled      u.Bool 
 }
 ```
 
 | Name                       | Description                                                                                                                                                                                                                          |
 | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
 | TabFocusesLinks            | A Boolean value that indicates whether pressing the tab key changes the focus to links and form controls. [Apple Docs](https://developer.apple.com/documentation/webkit/wkpreferences/2818595-tabfocuseslinks?language=objc)         |
 | TextInteractionEnabled     | A Boolean value that indicates whether to allow people to select or otherwise interact with text. [Apple Docs](https://developer.apple.com/documentation/webkit/wkpreferences/3727362-textinteractionenabled?language=objc)          |
+| FullscreenEnabled          | A Boolean value that indicates whether a web view can display content full screen. [Apple Docs](https://developer.apple.com/documentation/webkit/wkpreferences/3917769-elementfullscreenenabled?language=objc)                       |
 
 Example:
 
@@ -827,6 +829,7 @@ Mac: &mac.Options{
     Preferences: &mac.Preferences{
 		TabFocusesLinks:        mac.Enabled,
 		TextInteractionEnabled: mac.Disabled,
+		FullscreenEnabled:      mac.Enabled,
 	}
 }
 ```

diff --git a/website/src/pages/changelog.mdx b/website/src/pages/changelog.mdx
@@ -19,13 +19,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added support for enabling/disabling swipe gestures for Windows WebView2. Added by @leaanthony in [PR](https://github.com/wailsapp/wails/pull/2878)
 - When building with `-devtools` flag, CMD/CTRL+SHIFT+F12 can be used to open the devtools. Added by @leaanthony in [PR](https://github.com/wailsapp/wails/pull/2915)
 - Added support for setting some of the Webview preferences, `textInteractionEnabled` and `tabFocusesLinks` on Mac. Added by @fkhadra in [PR](https://github.com/wailsapp/wails/pull/2937)
+- Added support for enabling/disabling fullscreen of the Webview on Mac. Added by @fkhadra in [PR](https://github.com/wailsapp/wails/pull/2953)
 
 ### Changed
 
 - AssetServer requests are now processed asynchronously without blocking the main thread on Windows. Changed by @stffabi in [PR](https://github.com/wailsapp/wails/pull/2926)
 - AssetServer requests are now processed concurrently by spawning a goroutine per request. Changed by @stffabi in [PR](https://github.com/wailsapp/wails/pull/2926)
 - Now building with `-devtools` flag doesn't enable the default context-menu. Changed by @mmghv in [PR](https://github.com/wailsapp/wails/pull/2923)
-
+- Change Window Level. Changed by @almas1992 in [PR](https://github.com/wailsapp/wails/pull/2944)
 #### Fixed
 
 - Fixed typo on docs/reference/options page. Added by [@pylotlight](https://github.com/pylotlight) in [PR](https://github.com/wailsapp/wails/pull/2887)