Added more docs around config

Update HTML escaping
Fix custom HTML
2026-04-06 07:02:42 -07:00 · 2020-11-01 06:29:49 +11:00 · 2020-11-01 06:08:17 +11:00 · 2020-10-31 21:04:51 +11:00
3 changed files with 46 additions and 14 deletions
--- a/config.go
+++ b/config.go
@@ -1,20 +1,39 @@
 package wails
 import (
 	"fmt"
 	"net/url"
 	"strings"
 	"github.com/leaanthony/mewn"
 	"github.com/wailsapp/wails/runtime"
 )
 // AppConfig is the configuration structure used when creating a Wails App object
 type AppConfig struct {
-	Width, Height    int
+	// The width and height of your application in pixels
-	Title            string
+	Width, Height int
-	defaultHTML      string
+
-	HTML             string
+	// The title to put in the title bar
-	JS               string
+	Title string
-	CSS              string
+
-	Colour           string
+	// The HTML your app should use. If you leave it blank, a default will be used:
-	Resizable        bool
+	// <!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="IE=edge" content="IE=edge"></head><body><div id="app"></div><script type="text/javascript"></script></body></html>
 	HTML string
 	// The Javascript your app should use. Normally this should be generated by a bundler.
 	JS string
 	// The CSS your app should use. Normally this should be generated by a bundler.
 	CSS string
 	// The colour of your window. Can take "#fff", "rgb(255,255,255)", "rgba(255,255,255,1)" formats
 	Colour string
 	// Indicates whether your app should be resizable
 	Resizable bool
 	// Indicated if the devtools should be disabled
 	DisableInspector bool
 }
@@ -33,9 +52,14 @@ func (a *AppConfig) GetTitle() string {
 	return a.Title
 }
-// GetDefaultHTML returns the default HTML
+// GetHTML returns the default HTML
-func (a *AppConfig) GetDefaultHTML() string {
+func (a *AppConfig) GetHTML() string {
-	return a.defaultHTML
+	if len(a.HTML) > 0 {
 		a.HTML = url.QueryEscape(a.HTML)
 		a.HTML = "data:text/html," + strings.ReplaceAll(a.HTML, "+", "%20")
 		a.HTML = strings.ReplaceAll(a.HTML, "%3D", "=")
 	}
 	return a.HTML
 }
 // GetResizable returns true if the window should be resizable
@@ -79,6 +103,10 @@ func (a *AppConfig) merge(in *AppConfig) error {
 		a.JS = in.JS
 	}
 	if in.HTML != "" {
 		a.HTML = in.HTML
 	}
 	if in.Width != 0 {
 		a.Width = in.Width
 	}
@@ -109,5 +137,9 @@ func newConfig(userConfig *AppConfig) (*AppConfig, error) {
 		}
 	}
 	println("****************************************************")
 	fmt.Printf("%+v\n", result)
 	println("****************************************************")
 	return result, nil
 }
--- a/lib/interfaces/appconfig.go
+++ b/lib/interfaces/appconfig.go
@@ -6,9 +6,9 @@ type AppConfig interface {
 	GetHeight() int
 	GetTitle() string
 	GetResizable() bool
-	GetDefaultHTML() string
+	GetHTML() string
 	GetDisableInspector() bool
 	GetColour() string
 	GetCSS() string
 	GetJS() string
-}
+}
--- a/lib/renderer/webview.go
+++ b/lib/renderer/webview.go
@@ -58,7 +58,7 @@ func (w *WebView) Initialise(config interfaces.AppConfig, ipc interfaces.IPCMana
 		Height:    config.GetHeight(),
 		Title:     config.GetTitle(),
 		Resizable: config.GetResizable(),
-		URL:       config.GetDefaultHTML(),
+		URL:       config.GetHTML(),
 		Debug:     !config.GetDisableInspector(),
 		ExternalInvokeCallback: func(_ wv.WebView, message string) {
 			w.ipc.Dispatch(message, w.callback)
Author	SHA1	Message	Date
Lea Anthony	b6dd999757	Added more docs around config	2020-11-01 06:29:49 +11:00
Lea Anthony	e572345068	Update HTML escaping	2020-11-01 06:08:17 +11:00
Lea Anthony	1ddb74c6ce	Fix custom HTML	2020-10-31 21:04:51 +11:00