Merge branch 'v3-alpha' into fix-restore

mkdocs-website/docs/en/API/fullapi.md

@@ -298,6 +298,7 @@ import "github.com/wailsapp/wails/v3/pkg/application"
   - [func \(w \*WebviewWindow\) Size\(\) \(int, int\)](#WebviewWindow.Size)
   - [func \(w \*WebviewWindow\) ToggleDevTools\(\)](#WebviewWindow.ToggleDevTools)
   - [func \(w \*WebviewWindow\) ToggleFullscreen\(\)](#WebviewWindow.ToggleFullscreen)
+  - [func \(w \*WebviewWindow\) ToggleMaximise\(\)](#WebviewWindow.ToggleMaximise)
   - [func \(w \*WebviewWindow\) UnFullscreen\(\)](#WebviewWindow.UnFullscreen)
   - [func \(w \*WebviewWindow\) UnMaximise\(\)](#WebviewWindow.UnMaximise)
   - [func \(w \*WebviewWindow\) UnMinimise\(\)](#WebviewWindow.UnMinimise)
@@ -3715,6 +3716,16 @@ func (w *WebviewWindow) ToggleFullscreen()
 
 ToggleFullscreen toggles the window between fullscreen and normal
 
+<a name="WebviewWindow.ToggleMaximise"></a>
+
+### func \(\*WebviewWindow\) [ToggleMaximise](https://github.com/wailsapp/wails/blob/master/v3/pkg/application/webview_window.go#L720)
+
+```go
+func (w *WebviewWindow) ToggleMaximise()
+```
+
+ToggleMaximise toggles the window between maximised and normal
+
 <a name="WebviewWindow.UnFullscreen"></a>
 
 ### func \(\*WebviewWindow\) [UnFullscreen](https://github.com/wailsapp/wails/blob/master/v3/pkg/application/webview_window.go#L859)

mkdocs-website/docs/en/changelog.md

@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [linux] add task `run:linux` by [@marcus-crane](https://github.com/marcus-crane) in [#3146](https://github.com/wailsapp/wails/pull/3146)
 - export `SetIcon` method by  @almas1992 in [PR](https://github.com/wailsapp/wails/pull/3147)
 - Improve `OnShutdown` by  @almas1992 in [PR](https://github.com/wailsapp/wails/pull/3189)
+- restore `ToggleMaximise` method in `Window` interface by [@fbbdev](https://github.com/fbbdev) in [#3281](https://github.com/wailsapp/wails/pull/3281)
 
 ### Fixed
 
@@ -39,6 +40,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix replace line in `go.mod` to use relative paths. Fixes Windows paths with spaces - @leaanthony.
 - Fix MacOS systray click handling when no attached window by [thomas-senechal](https://github.com/thomas-senechal) in PR [#3207](https://github.com/wailsapp/wails/pull/3207)
 - Fix failing Windows build due to unknown option by [thomas-senechal](https://github.com/thomas-senechal) in PR [#3208](https://github.com/wailsapp/wails/pull/3208)
+- Fix wrong baseURL when open window twice by @5aaee9 in PR [#3273](https://github.com/wailsapp/wails/pull/3273)
 - Fix ordering of if branches in `WebviewWindow.Restore` method by [@fbbdev](https://github.com/fbbdev) in [#3279](https://github.com/wailsapp/wails/pull/3279)
 
 ### Changed

v3/examples/window-api/assets/index.html

@@ -145,6 +145,9 @@
     <p class="blue-button-42" onclick="wails.Window.UnFullscreen()">UnFullscreen</p>
     <p class="blue-button-42" onclick="wails.Window.Restore()">Restore</p>
 </div>
+<div>
+    <p class="blue-button-42" onclick="wails.Window.ToggleMaximise()">ToggleMaximise</p>
+</div>
 </body>
 </html>
 

v3/internal/assetserver/assetserver.go

@@ -7,7 +7,6 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"net/url"
-	"path"
 	"strings"
 	"time"
 )
@@ -160,8 +159,7 @@ func GetStartURL(userURL string) (string, error) {
 				return "", fmt.Errorf("Error parsing URL: " + err.Error())
 			}
 			if parsedURL.Scheme == "" {
-				baseURL.Path = path.Join(baseURL.Path, userURL)
-				startURL = baseURL.String()
+				startURL = baseURL.ResolveReference(&url.URL{Path: userURL}).String()
 				// if the original URL had a trailing slash, add it back
 				if strings.HasSuffix(userURL, "/") && !strings.HasSuffix(startURL, "/") {
 					startURL = startURL + "/"

v3/pkg/application/messageprocessor.go

@@ -12,16 +12,16 @@ import (
 // as parameter through every function call.
 
 const (
-	callRequest        int = 0
-	clipboardRequest       = 1
-	applicationRequest     = 2
-	eventsRequest          = 3
-	contextMenuRequest     = 4
-	dialogRequest          = 5
-	windowRequest          = 6
-	screensRequest         = 7
-	systemRequest          = 8
-	browserRequest         = 9
+	callRequest        = 0
+	clipboardRequest   = 1
+	applicationRequest = 2
+	eventsRequest      = 3
+	contextMenuRequest = 4
+	dialogRequest      = 5
+	windowRequest      = 6
+	screensRequest     = 7
+	systemRequest      = 8
+	browserRequest     = 9
 )
 
 type MessageProcessor struct {

v3/pkg/application/messageprocessor_window.go

@@ -123,6 +123,9 @@ func (m *MessageProcessor) processWindowMethod(method int, rw http.ResponseWrite
 	case WindowUnMaximise:
 		window.UnMaximise()
 		m.ok(rw)
+	case WindowToggleMaximise:
+		window.ToggleMaximise()
+		m.ok(rw)
 	case WindowRestore:
 		window.Restore()
 		m.ok(rw)

v3/pkg/application/webview_window.go

@@ -803,6 +803,20 @@ func (w *WebviewWindow) ToggleFullscreen() {
 	})
 }
 
+// ToggleMaximise toggles the window between maximised and normal
+func (w *WebviewWindow) ToggleMaximise() {
+	if w.impl == nil && !w.isDestroyed() {
+		return
+	}
+	InvokeSync(func() {
+		if w.IsMaximised() {
+			w.UnMaximise()
+		} else {
+			w.Maximise()
+		}
+	})
+}
+
 func (w *WebviewWindow) ToggleDevTools() {
 	if w.impl == nil && !w.isDestroyed() {
 		return

v3/pkg/application/window.go

@@ -67,6 +67,7 @@ type Window interface {
 	Size() (width int, height int)
 	ToggleDevTools()
 	ToggleFullscreen()
+	ToggleMaximise()
 	UnFullscreen()
 	UnMaximise()
 	UnMinimise()

v3/plugins/experimental/server/window.go

@@ -217,6 +217,8 @@ func (w Window) ToggleDevTools() {
 
 func (w Window) ToggleFullscreen() {}
 
+func (w Window) ToggleMaximise() {}
+
 func (w Window) UnFullscreen() {}
 
 func (w Window) UnMaximise() {}