diff --git a/cmd/linux.go b/cmd/linux.go
index 3354ba4e0..4d5b91ca0 100644
--- a/cmd/linux.go
+++ b/cmd/linux.go
@@ -65,6 +65,8 @@ const (
Solus
// Ctlos Linux distribution
Ctlos
+ // EndeavourOS linux distribution
+ EndeavourOS
)
// DistroInfo contains all the information relating to a linux distribution
@@ -132,7 +134,7 @@ func parseOsRelease(osRelease string) *DistroInfo {
case "archlabs":
result.Distribution = ArchLabs
case "ctlos":
- result.Distribution = Ctlos
+ result.Distribution = Ctlos
case "debian":
result.Distribution = Debian
case "ubuntu":
@@ -171,6 +173,8 @@ func parseOsRelease(osRelease string) *DistroInfo {
result.Distribution = PopOS
case "solus":
result.Distribution = Solus
+ case "endeavouros":
+ result.Distribution = EndeavourOS
default:
result.Distribution = Unknown
}
diff --git a/cmd/linuxdb.yaml b/cmd/linuxdb.yaml
index ed314f545..616ccd0f6 100644
--- a/cmd/linuxdb.yaml
+++ b/cmd/linuxdb.yaml
@@ -202,7 +202,16 @@ distributions:
name: Ctlos Linux
gccversioncommand: *gccdumpversion
programs: *archdefaultprograms
- libraries: *archdefaultlibraries
+ libraries: *archdefaultlibraries
+ endeavouros:
+ id: endeavouros
+ releases:
+ default:
+ version: default
+ name: EndeavourOS
+ gccversioncommand: *gccdumpversion
+ programs: *archdefaultprograms
+ libraries: *archdefaultlibraries
manjaro:
id: manjaro
releases:
diff --git a/cmd/system.go b/cmd/system.go
index 798f1230f..ab3c9e5dd 100644
--- a/cmd/system.go
+++ b/cmd/system.go
@@ -276,7 +276,7 @@ func CheckDependencies(logger *Logger) (bool, error) {
switch distroInfo.Distribution {
case Ubuntu, Debian, Zorin, Parrot, Linuxmint, Elementary, Kali, Neon, Deepin, Raspbian, PopOS:
libraryChecker = DpkgInstalled
- case Arch, ArcoLinux, ArchLabs, Ctlos, Manjaro, ManjaroARM:
+ case Arch, ArcoLinux, ArchLabs, Ctlos, Manjaro, ManjaroARM, EndeavourOS:
libraryChecker = PacmanInstalled
case CentOS, Fedora, Tumbleweed, Leap:
libraryChecker = RpmInstalled
diff --git a/cmd/version.go b/cmd/version.go
index 9594ecc74..7391ce453 100644
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -1,4 +1,4 @@
package cmd
// Version - Wails version
-const Version = "v1.9.1"
+const Version = "v1.10.0"
diff --git a/config.go b/config.go
index 9ebdf43cf..d4d1f2dbb 100644
--- a/config.go
+++ b/config.go
@@ -1,20 +1,38 @@
package wails
import (
- b64 "encoding/base64"
+ "fmt"
+ "net/url"
+ "strings"
"github.com/wailsapp/wails/runtime"
)
// AppConfig is the configuration structure used when creating a Wails App object
type AppConfig struct {
- Width, Height int
- Title string
- HTML string
- JS string
- CSS string
- Colour string
- Resizable bool
+ // The width and height of your application in pixels
+ Width, Height int
+
+ // The title to put in the title bar
+ Title string
+
+ // The HTML your app should use. If you leave it blank, a default will be used:
+ //
+ 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 +51,14 @@ func (a *AppConfig) GetTitle() string {
return a.Title
}
-// GetHTML returns the HTML for the app
+// GetHTML returns the default HTML
func (a *AppConfig) GetHTML() string {
- return "data:text/html;base64," + b64.URLEncoding.EncodeToString([]byte(a.HTML))
+ 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
@@ -83,6 +106,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
}
@@ -113,6 +140,10 @@ func newConfig(userConfig *AppConfig) (*AppConfig, error) {
}
}
+ println("****************************************************")
+ fmt.Printf("%+v\n", result)
+ println("****************************************************")
+
return result, nil
}