Merge branch 'develop'

README.md

@@ -174,7 +174,7 @@ It is recommended at this stage to read the comprehensive documentation at [http
 <a href="https://github.com/RH12503"><img src="https://github.com/RH12503.png?size=40" width="40"/></a>
 <a href="https://github.com/hi019"><img src="https://github.com/hi019.png?size=40" width="40"/></a></a>
 <a href="https://github.com/Igogrek"><img src="https://github.com/Igogrek.png?size=40" width="40"/></a></a>
-
+<a href="https://github.com/aschey"><img src="https://github.com/aschey.png?size=40" width="40"/></a></a>
 
 ## Special Mentions
 

cmd/helpers.go

@@ -16,7 +16,7 @@ import (
 	wailsruntime "github.com/wailsapp/wails/runtime"
 )
 
-const xgoVersion = "1.0.1"
+const xgoVersion = "1.16.2"
 
 var fs = NewFSHelper()
 

cmd/linux.go

@@ -69,6 +69,8 @@ const (
 	EndeavourOS
 	// Crux linux distribution
 	Crux
+	// RHEL distribution
+	RHEL
 )
 
 // DistroInfo contains all the information relating to a linux distribution
@@ -131,6 +133,8 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		result.Distribution = Fedora
 	case "centos":
 		result.Distribution = CentOS
+	case "rhel":
+		result.Distribution = RHEL
 	case "arch":
 		result.Distribution = Arch
 	case "archlabs":

cmd/linuxdb.yaml

@@ -138,6 +138,25 @@ distributions:
             help: Please install with `sudo yum install gtk3-devel` and try again
           - name: webkitgtk3-devel
             help: Please install with `sudo yum install webkitgtk3-devel` and try again
+  rhel:
+    id: rhel
+    releases:
+      default:
+        version: default
+        name: Red Hat Enterprise Linux
+        gccversioncommand: *gccdumpversion
+        programs:
+          - name: gcc
+            help: Please install with `sudo yum install gcc-c++ make` and try again
+          - name: pkg-config
+            help: Please install with `sudo yum install pkgconf-pkg-config` and try again
+          - name: npm
+            help: Please install with `sudo yum install epel-release && sudo yum install nodejs` and try again
+        libraries:
+          - name: gtk3-devel
+            help: Please install with `sudo yum install gtk3-devel` and try again
+          - name: webkitgtk3-devel
+            help: Please install with `sudo yum install webkitgtk3-devel` and try again
   fedora:
     id: fedora
     releases:

cmd/package.go

@@ -354,7 +354,7 @@ func (b *PackageHelper) PackageWindows(po *ProjectOptions, cleanUp bool) error {
 			"docker", "run", "--rm",
 			"-v", outputDir + ":/build",
 			"--entrypoint", "/bin/sh",
-			"wailsapp/xgo:latest",
+			"wailsapp/xgo:1.16.2",
 			"-c", "/usr/bin/x86_64-w64-mingw32-windres -o /build/" + basename + "-res.syso /build/" + basename + ".rc",
 		}
 		if err := NewProgramHelper().RunCommandArray(args); err != nil {

cmd/system.go

@@ -283,7 +283,7 @@ func CheckDependencies(logger *Logger) (bool, error) {
 			libraryChecker = DpkgInstalled
 		case Arch, ArcoLinux, ArchLabs, Ctlos, Manjaro, ManjaroARM, EndeavourOS:
 			libraryChecker = PacmanInstalled
-		case CentOS, Fedora, Tumbleweed, Leap:
+		case CentOS, Fedora, Tumbleweed, Leap, RHEL:
 			libraryChecker = RpmInstalled
 		case Gentoo:
 			libraryChecker = EqueryInstalled

cmd/version.go

@@ -1,4 +1,4 @@
 package cmd
 
 // Version - Wails version
-const Version = "v1.16.0"
+const Version = "v1.16.3"

config.go

@@ -181,7 +181,7 @@ func newConfig(userConfig *AppConfig) (*AppConfig, error) {
 		MaxWidth:  -1,
 		MaxHeight: -1,
 		Title:     "My Wails App",
-		Colour:    "#FFF", // White by default
+		Colour:    "", 
 		HTML:      defaultHTML,
 	}
 

lib/renderer/webview.go

@@ -111,11 +111,14 @@ func (w *WebView) Initialise(config interfaces.AppConfig, ipc interfaces.IPCMana
 	}
 
 	// SignalManager.OnExit(w.Exit)
-
+	
 	// Set colour
-	err := w.SetColour(config.GetColour())
+	color := config.GetColour()
-	if err != nil {
+	if color != "" {
-		return err
+		err := w.SetColour(color)
+		if err != nil {
+			return err
+		}
 	}
 
 	w.log.Info("Initialised")

lib/renderer/webview/webview.h

@@ -2337,11 +2337,10 @@ struct webview_priv
     size.width = width;
     size.height = height;
     [w->priv.window setMaxSize:size];
-    
+
-    [w->priv.window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenAuxiliary|NSWindowCollectionBehaviorFullScreenNone|NSWindowCollectionBehaviorFullScreenDisallowsTiling];
-       
     NSButton *button = [w->priv.window standardWindowButton:NSWindowZoomButton];
-    [button setEnabled: NO];
+    [button performSelectorOnMainThread:@selector(setEnabled:) withObject:NO
+    waitUntilDone:NO];
   }
   
   WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen)

runtime/js/core/main.js

@@ -1,9 +1,9 @@
 /*
- _       __      _ __    
+ _       __      _ __
 | |     / /___ _(_) /____
 | | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  ) 
+| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/  
+|__/|__/\__,_/_/_/____/
 The lightweight framework for web-like apps
 (c) Lea Anthony 2019-present
 */
@@ -21,6 +21,20 @@ import * as Store from './store';
 window.wails = window.wails || {};
 window.backend = {};
 
+// On webkit2gtk >= 2.32, the external object is not passed to the window context.
+// However, IE will throw a strict mode error if window.external is assigned to
+// so we need to make sure that line of code isn't reached in IE
+
+// Using !window.external transpiles to `window.external = window.external || ...`
+// so we have to use an explicit if statement to prevent webpack from optimizing the code.
+if (window.external == undefined) {
+	window.external = {
+		invoke: function(x) {
+			window.webkit.messageHandlers.external.postMessage(x);
+		}
+	};
+}
+
 // Setup internal calls
 var internal = {
 	NewBinding,
@@ -61,7 +75,7 @@ window.onerror = function (msg, url, lineNo, columnNo, error) {
 };
 
 // Use firebug?
-if( window.usefirebug ) { 
+if( window.usefirebug ) {
 	InjectFirebug();
 }
 
@@ -71,4 +85,4 @@ Emit('wails:loaded');
 // Nothing to init in production
 export function Init(callback) {
 	callback();
-}
+}