v1.12.0-pre5

Update CONTRIBUTORS.md
Put main window into focus after a dialog closes (#609 )
2026-04-03 05:38:56 -07:00 · 2021-02-21 09:18:06 +11:00 · 2021-02-21 09:16:27 +11:00 · 2021-02-21 09:11:55 +11:00 · 2021-02-05 16:55:27 +11:00 · 2021-02-05 16:54:00 +11:00
33 changed files with 364 additions and 109 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -39,3 +39,9 @@ Wails is what it is because of the time and effort given by these great people.
  * [Kyle](https://github.com/kmuchmore)
  * [Balakrishna Prasad Ganne](https://github.com/aayush420)
  * [Charaf Rezrazi](https://github.com/Rezrazi)
+  * [misitebao](https://github.com/misitebao)
+  * [Elie Grenon](https://github.com/DrunkenPoney)
+  * [SophieAu](https://github.com/SophieAu)
+  * [Alexander Matviychuk](https://github.com/alexmat)
+  * [RH12503](https://github.com/RH12503) 
+  
--- a/README.md
+++ b/README.md
@@ -147,7 +147,13 @@ This project was mainly coded to the following albums:

 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwailsapp%2Fwails.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fwailsapp%2Fwails?ref=badge_large)

-## Special Thank You
+## Special Thanks
+
+<p align="center" style="text-align: center">
+   <a href="https://pace.dev"><img src="pace.jpeg"/></a><br/>
+   A *huge* thanks to <a href="https://pace.dev">Pace</a> for sponsoring the project and helping the efforts to get Wails ported to Apple Silicon!<br/><br/>
+   If you are looking for a Project Management tool that's powerful but quick and easy to use, check them out!<br/><br/>
+</p>

 <p align="center" style="text-align: center">
   A special thank you to JetBrains for donating licenses to us!<br/><br/>
--- a/app.go
+++ b/app.go
@@ -2,7 +2,6 @@ package wails

 import (
 	"os"
-	"runtime"
 	"syscall"

 	"github.com/syossan27/tebata"
@@ -117,11 +116,6 @@ func (a *App) start() error {
 		return err
 	}

-	// Enable console for Windows debug builds
-	if runtime.GOOS == "windows" && BuildMode == cmd.BuildModeDebug {
-		a.renderer.EnableConsole()
-	}
-
 	// Start signal handler
 	t := tebata.New(os.Interrupt, os.Kill, syscall.SIGTERM, syscall.SIGINT, syscall.SIGKILL)
 	t.Reserve(func() {
--- a/cmd/helpers.go
+++ b/cmd/helpers.go
@@ -574,6 +574,10 @@ func ldFlags(po *ProjectOptions, buildMode string) string {
 		ldflags += "-H windowsgui "
 	}

+	if po.UseFirebug {
+		ldflags += "-X github.com/wailsapp/wails/lib/renderer.UseFirebug=true "
+	}
+
 	ldflags += "-X github.com/wailsapp/wails.BuildMode=" + buildMode

 	// Add additional ldflags passed in via the `ldflags` cli flag
--- a/cmd/linux.go
+++ b/cmd/linux.go
@@ -65,6 +65,10 @@ const (
 	Solus
 	// Ctlos Linux distribution
 	Ctlos
+	// EndeavourOS linux distribution
+	EndeavourOS
+	// Crux linux distribution
+	Crux
 )

 // DistroInfo contains all the information relating to a linux distribution
@@ -132,7 +136,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 +175,10 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		result.Distribution = PopOS
 	case "solus":
 		result.Distribution = Solus
+	case "endeavouros":
+		result.Distribution = EndeavourOS
+	case "crux":
+		result.Distribution = Crux
 	default:
 		result.Distribution = Unknown
 	}
@@ -251,6 +259,17 @@ func RpmInstalled(packageName string) (bool, error) {
 	return exitCode == 0, nil
 }

+// PrtGetInstalled uses prt-get to see if a package is installed
+func PrtGetInstalled(packageName string) (bool, error) {
+	program := NewProgramHelper()
+	prtget := program.FindProgram("prt-get")
+	if prtget == nil {
+		return false, fmt.Errorf("cannot check dependencies: prt-get not found")
+	}
+	_, _, exitCode, _ := prtget.Run("isinst", packageName)
+	return exitCode == 0, nil
+}
+
 // RequestSupportForDistribution promts the user to submit a request to support their
 // currently unsupported distribution
 func RequestSupportForDistribution(distroInfo *DistroInfo) error {
--- 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:
@@ -298,3 +307,22 @@ distributions:
          gccversioncommand: *gccdumpfullversion
          programs: *opensusedefaultprograms
          libraries: *opensusedefaultlibraries
+  crux:
+      id: crux
+      releases:
+        default:
+          version: default
+          name: Crux Linux
+          gccversioncommand: *gccdumpversion
+          programs:
+            - name: gcc
+              help: Please install with `sudo prt-get depinst gcc-c++ make` and try again
+            - name: pkg-config
+              help: Please install with `sudo prt-get depinst pkg-config` and try again
+            - name: npm
+              help: Please install with `sudo prt-get depinst nodejs` and try again
+          libraries:
+            - name: gtk3
+              help: Please install with `sudo prt-get depinst gtk3` and try again
+            - name: webkitgtk
+              help: Please install with `sudo prt-get depinst webkitgtk` and try again
--- a/cmd/project.go
+++ b/cmd/project.go
@@ -165,6 +165,7 @@ type ProjectOptions struct {
 	Architecture           string
 	LdFlags                string
 	GoPath                 string
+	UseFirebug             bool

 	// Supported platforms
 	Platforms []string `json:"platforms,omitempty"`
--- a/cmd/semver.go
+++ b/cmd/semver.go
@@ -24,11 +24,19 @@ func NewSemanticVersion(version string) (*SemanticVersion, error) {

 // IsRelease returns true if it's a release version
 func (s *SemanticVersion) IsRelease() bool {
+	// Limit to v1
+	if s.Version.Major() != 1 {
+		return false
+	}
 	return len(s.Version.Prerelease()) == 0 && len(s.Version.Metadata()) == 0
 }

 // IsPreRelease returns true if it's a prerelease version
 func (s *SemanticVersion) IsPreRelease() bool {
+	// Limit to v1
+	if s.Version.Major() != 1 {
+		return false
+	}
 	return len(s.Version.Prerelease()) > 0
 }

--- a/cmd/semver_test.go
+++ b/cmd/semver_test.go
@@ -0,0 +1,65 @@
+package cmd
+
+import (
+	"testing"
+)
+
+func TestSemanticVersion_IsPreRelease(t *testing.T) {
+	tests := []struct {
+		name    string
+		version string
+		want    bool
+	}{
+		{"v1.6.7-pre0", "v1.6.7-pre0", true},
+		{"v2.6.7+pre0", "v2.6.7+pre0", false},
+		{"v2.6.7", "v2.6.7", false},
+		{"v2.0.0+alpha.1", "v2.0.0+alpha.1", false},
+		{"v2.0.0-alpha.1", "v2.0.0-alpha.1", false},
+		{"v1.6.7", "v1.6.7", false},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			semanticversion, err := NewSemanticVersion(tt.version)
+			if err != nil {
+				t.Errorf("Invalid semantic version: %s", semanticversion)
+				return
+			}
+			s := &SemanticVersion{
+				Version: semanticversion.Version,
+			}
+			if got := s.IsPreRelease(); got != tt.want {
+				t.Errorf("IsPreRelease() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestSemanticVersion_IsRelease(t *testing.T) {
+	tests := []struct {
+		name    string
+		version string
+		want    bool
+	}{
+		{"v1.6.7", "v1.6.7", true},
+		{"v2.6.7-pre0", "v2.6.7-pre0", false},
+		{"v2.6.7", "v2.6.7", false},
+		{"v2.6.7+release", "v2.6.7+release", false},
+		{"v2.0.0-alpha.1", "v2.0.0-alpha.1", false},
+		{"v1.6.7-pre0", "v1.6.7-pre0", false},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			semanticversion, err := NewSemanticVersion(tt.version)
+			if err != nil {
+				t.Errorf("Invalid semantic version: %s", semanticversion)
+				return
+			}
+			s := &SemanticVersion{
+				Version: semanticversion.Version,
+			}
+			if got := s.IsRelease(); got != tt.want {
+				t.Errorf("IsRelease() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
--- 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
@@ -286,6 +286,8 @@ func CheckDependencies(logger *Logger) (bool, error) {
 			libraryChecker = XbpsInstalled
 		case Solus:
 			libraryChecker = EOpkgInstalled
+		case Crux:
+			libraryChecker = PrtGetInstalled
 		default:
 			return false, RequestSupportForDistribution(distroInfo)
 		}
--- a/cmd/templates/svelte/frontend/rollup.config.js
+++ b/cmd/templates/svelte/frontend/rollup.config.js
@@ -80,7 +80,6 @@ export default {
 				{
 				  targets: '> 0.25%, not dead, IE 11',
 				  modules: false,
-				  spec: true, 
 				  useBuiltIns: 'usage',
 				  forceAllTransforms: true,
 				  corejs: 3,
--- a/cmd/templates/vue3-full/frontend/package.json.template
+++ b/cmd/templates/vue3-full/frontend/package.json.template
@@ -19,16 +19,16 @@
    "@types/mocha": "^8.0.3",
    "@typescript-eslint/eslint-plugin": "^4.3.0",
    "@typescript-eslint/parser": "^4.3.0",
-    "@vue/cli-plugin-eslint": "~4.5.6",
-    "@vue/cli-plugin-router": "~4.5.6",
-    "@vue/cli-plugin-typescript": "~4.5.6",
-    "@vue/cli-plugin-unit-mocha": "~4.5.6",
-    "@vue/cli-service": "~4.5.6",
+    "@vue/cli-plugin-eslint": "~4.5.9",
+    "@vue/cli-plugin-router": "~4.5.9",
+    "@vue/cli-plugin-typescript": "~4.5.9",
+    "@vue/cli-plugin-unit-mocha": "~4.5.9",
+    "@vue/cli-service": "~4.5.9",
    "@vue/compiler-sfc": "^3.0.0",
-    "@vue/eslint-config-typescript": "^5.1.0",
+    "@vue/eslint-config-typescript": "^7.0.0",
    "@vue/test-utils": "^2.0.0-0",
    "chai": "^4.2.0",
-    "eslint": "^7.10.0",
+    "eslint": "<7.0.0",
    "eslint-plugin-vue": "^7.0.0",
    "node-sass": "^4.14.1",
    "sass-loader": "^10.0.2",
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -1,4 +1,5 @@
 package cmd

 // Version - Wails version
-const Version = "v1.8.1-pre6"
+const Version = "v1.12.0-pre5"
+
--- a/cmd/wails/4_build.go
+++ b/cmd/wails/4_build.go
@@ -26,6 +26,7 @@ func init() {
 	var packageApp = false
 	var forceRebuild = false
 	var debugMode = false
+	var usefirebug = false
 	var gopath = ""
 	var typescriptFilename = ""
 	var verbose = false
@@ -42,6 +43,7 @@ func init() {
 		BoolFlag("p", "Package application on successful build", &packageApp).
 		BoolFlag("f", "Force rebuild of application components", &forceRebuild).
 		BoolFlag("d", "Build in Debug mode", &debugMode).
+		BoolFlag("firebug", "Enable firebug console for debug builds", &usefirebug).
 		BoolFlag("verbose", "Verbose output", &verbose).
 		StringFlag("t", "Generate Typescript definitions to given file (at runtime)", &typescriptFilename).
 		StringFlag("ldflags", "Extra options for -ldflags", &ldflags).
@@ -71,6 +73,7 @@ func init() {
 		// Project options
 		projectOptions := &cmd.ProjectOptions{}
 		projectOptions.Verbose = verbose
+		projectOptions.UseFirebug = usefirebug

 		// Check we are in project directory
 		// Check project.json loads correctly
@@ -80,6 +83,9 @@ func init() {
 			return fmt.Errorf("Unable to find 'project.json'. Please check you are in a Wails project directory")
 		}

+		// Set firebug flag
+		projectOptions.UseFirebug = usefirebug
+
 		// Check that this platform is supported
 		if !projectOptions.PlatformSupported() {
 			logger.Yellow("WARNING: This project is unsupported on %s - it probably won't work!\n         Valid platforms: %s\n", runtime.GOOS, strings.Join(projectOptions.Platforms, ", "))
--- a/config.go
+++ b/config.go
@@ -1,20 +1,37 @@
 package wails

 import (
-	"github.com/leaanthony/mewn"
+	"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
-	defaultHTML      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:
+	// <!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 +50,14 @@ func (a *AppConfig) GetTitle() string {
 	return a.Title
 }

-// GetDefaultHTML returns the default HTML
-func (a *AppConfig) GetDefaultHTML() string {
-	return a.defaultHTML
+// GetHTML returns the default HTML
+func (a *AppConfig) GetHTML() string {
+	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
@@ -75,10 +97,18 @@ func (a *AppConfig) merge(in *AppConfig) error {
 		a.Colour = in.Colour
 	}

+	if in.HTML != "" {
+		a.HTML = in.HTML
+	}
+
 	if in.JS != "" {
 		a.JS = in.JS
 	}

+	if in.HTML != "" {
+		a.HTML = in.HTML
+	}
+
 	if in.Width != 0 {
 		a.Width = in.Width
 	}
@@ -99,7 +129,7 @@ func newConfig(userConfig *AppConfig) (*AppConfig, error) {
 		Resizable: true,
 		Title:     "My Wails App",
 		Colour:    "#FFF", // White by default
-		HTML:      mewn.String("./runtime/assets/default.html"),
+		HTML:      defaultHTML,
 	}

 	if userConfig != nil {
@@ -111,3 +141,17 @@ func newConfig(userConfig *AppConfig) (*AppConfig, error) {

 	return result, nil
 }
+
+var defaultHTML = `<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+</head>
+
+<body>
+  <div id="app"></div>
+</body>
+
+</html>`
--- a/lib/event/manager.go
+++ b/lib/event/manager.go
@@ -18,6 +18,7 @@ type Manager struct {
 	log            *logger.CustomLogger
 	renderer       interfaces.Renderer // Messages will be dispatched to the frontend
 	wg             sync.WaitGroup
+	mu             sync.Mutex
 }

 // NewManager creates a new event manager with a 100 event buffer
@@ -42,12 +43,12 @@ func (e *Manager) PushEvent(eventData *messages.EventData) {
 // means it does not expire (default).
 type eventListener struct {
 	callback func(...interface{}) // Function to call with emitted event data
-	counter  int                  // Expire after counter callbacks. 0 = infinite
+	counter  uint                 // Expire after counter callbacks. 0 = infinite
 	expired  bool                 // Indicates if the listener has expired
 }

 // Creates a new event listener from the given callback function
-func (e *Manager) addEventListener(eventName string, callback func(...interface{}), counter int) error {
+func (e *Manager) addEventListener(eventName string, callback func(...interface{}), counter uint) error {

 	// Sanity check inputs
 	if callback == nil {
@@ -75,7 +76,30 @@ func (e *Manager) addEventListener(eventName string, callback func(...interface{
 // On adds a listener for the given event
 func (e *Manager) On(eventName string, callback func(...interface{})) {
 	// Add a persistent eventListener (counter = 0)
-	e.addEventListener(eventName, callback, 0)
+	err := e.addEventListener(eventName, callback, 0)
+	if err != nil {
+		e.log.Error(err.Error())
+	}
+}
+
+// Once adds a listener for the given event that will auto remove
+// after one callback
+func (e *Manager) Once(eventName string, callback func(...interface{})) {
+	// Add a persistent eventListener (counter = 0)
+	err := e.addEventListener(eventName, callback, 1)
+	if err != nil {
+		e.log.Error(err.Error())
+	}
+}
+
+// OnMultiple adds a listener for the given event that will trigger
+// at most <counter> times.
+func (e *Manager) OnMultiple(eventName string, callback func(...interface{}), counter uint) {
+	// Add a persistent eventListener (counter = 0)
+	err := e.addEventListener(eventName, callback, counter)
+	if err != nil {
+		e.log.Error(err.Error())
+	}
 }

 // Emit broadcasts the given event to the subscribed listeners
@@ -108,20 +132,24 @@ func (e *Manager) Start(renderer interfaces.Renderer) {
 				})

 				// Notify renderer
-				e.renderer.NotifyEvent(event)
+				err := e.renderer.NotifyEvent(event)
+				if err != nil {
+					e.log.Error(err.Error())
+				}

-				// Notify Go listeners
-				var listenersToRemove []*eventListener
+				e.mu.Lock()

 				// Iterate listeners
 				for _, listener := range e.listeners[event.Name] {

-					// Call listener, perhaps with data
-					if event.Data == nil {
-						go listener.callback()
-					} else {
-						unpacked := event.Data.([]interface{})
-						go listener.callback(unpacked...)
+					if !listener.expired {
+						// Call listener, perhaps with data
+						if event.Data == nil {
+							go listener.callback()
+						} else {
+							unpacked := event.Data.([]interface{})
+							go listener.callback(unpacked...)
+						}
 					}

 					// Update listen counter
@@ -133,15 +161,8 @@ func (e *Manager) Start(renderer interfaces.Renderer) {
 					}
 				}

-				// Remove expired listeners in place
-				if len(listenersToRemove) > 0 {
-					listeners := e.listeners[event.Name][:0]
-					for _, listener := range listeners {
-						if !listener.expired {
-							listeners = append(listeners, listener)
-						}
-					}
-				}
+				e.mu.Unlock()
+
 			case <-e.quitChannel:
 				e.running = false
 			}
--- 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/interfaces/eventmanager.go
+++ b/lib/interfaces/eventmanager.go
@@ -6,6 +6,8 @@ import "github.com/wailsapp/wails/lib/messages"
 type EventManager interface {
 	PushEvent(*messages.EventData)
 	Emit(eventName string, optionalData ...interface{})
+	OnMultiple(eventName string, callback func(...interface{}), counter uint)
+	Once(eventName string, callback func(...interface{}))
 	On(eventName string, callback func(...interface{}))
 	Start(Renderer)
 	Shutdown()
--- a/lib/interfaces/renderer.go
+++ b/lib/interfaces/renderer.go
@@ -8,7 +8,6 @@ import (
 type Renderer interface {
 	Initialise(AppConfig, IPCManager, EventManager) error
 	Run() error
-	EnableConsole()

 	// Binding
 	NewBinding(bindingName string) error
--- a/lib/renderer/bridge/bridge.go
+++ b/lib/renderer/bridge/bridge.go
@@ -56,10 +56,6 @@ func (h *Bridge) Initialise(appConfig interfaces.AppConfig, ipcManager interface
 	return nil
 }

-// EnableConsole not needed for bridge!
-func (h *Bridge) EnableConsole() {
-}
-
 func (h *Bridge) wsBridgeHandler(w http.ResponseWriter, r *http.Request) {
 	conn, err := websocket.Upgrade(w, r, w.Header(), 1024, 1024)
 	if err != nil {
--- a/lib/renderer/bridge/renderer-mewn.go
+++ b/lib/renderer/bridge/renderer-mewn.go
--- a/lib/renderer/renderer-mewn.go
+++ b/lib/renderer/renderer-mewn.go
--- a/lib/renderer/webview.go
+++ b/lib/renderer/webview.go
@@ -18,14 +18,17 @@ import (

 // WebView defines the main webview application window
 // Default values in []
+
+// UseFirebug indicates whether to inject the firebug console
+var UseFirebug = ""
+
 type WebView struct {
-	window        wv.WebView // The webview object
-	ipc           interfaces.IPCManager
-	log           *logger.CustomLogger
-	config        interfaces.AppConfig
-	eventManager  interfaces.EventManager
-	bindingCache  []string
-	enableConsole bool
+	window       wv.WebView // The webview object
+	ipc          interfaces.IPCManager
+	log          *logger.CustomLogger
+	config       interfaces.AppConfig
+	eventManager interfaces.EventManager
+	bindingCache []string
 }

 // NewWebView returns a new WebView struct
@@ -55,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)
@@ -104,11 +107,6 @@ func (w *WebView) evalJS(js string) error {
 	return nil
 }

-// EnableConsole enables the console!
-func (w *WebView) EnableConsole() {
-	w.enableConsole = true
-}
-
 // Escape the Javascripts!
 func escapeJS(js string) (string, error) {
 	result := strings.Replace(js, "\\", "\\\\", -1)
@@ -179,10 +177,9 @@ func (w *WebView) Run() error {
 	w.log.Info("Running...")

 	// Inject firebug in debug mode on Windows
-	if w.enableConsole {
-		w.log.Debug("Enabling Wails console")
-		console := mewn.String("../../runtime/assets/console.js")
-		w.evalJS(console)
+	if UseFirebug != "" {
+		w.log.Debug("Injecting Firebug")
+		w.evalJS(`window.usefirebug=true;`)
 	}

 	// Runtime assets
@@ -259,6 +256,9 @@ func (w *WebView) SelectFile(title string, filter string) string {
 			wg.Done()
 		})
 	}()
+
+	defer w.focus() // Ensure the main window is put back into focus afterwards
+
 	wg.Wait()
 	return result
 }
@@ -277,6 +277,9 @@ func (w *WebView) SelectDirectory() string {
 			wg.Done()
 		})
 	}()
+
+	defer w.focus() // Ensure the main window is put back into focus afterwards
+
 	wg.Wait()
 	return result
 }
@@ -295,10 +298,20 @@ func (w *WebView) SelectSaveFile(title string, filter string) string {
 			wg.Done()
 		})
 	}()
+
+	defer w.focus() // Ensure the main window is put back into focus afterwards
+
 	wg.Wait()
 	return result
 }

+// focus puts the main window into focus
+func (w *WebView) focus() {
+	w.window.Dispatch(func() {
+		w.window.Focus()
+	})
+}
+
 // callback sends a callback to the frontend
 func (w *WebView) callback(data string) error {
 	callbackCMD := fmt.Sprintf("window.wails._.Callback('%s');", data)
--- a/lib/renderer/webview/webview.go
+++ b/lib/renderer/webview/webview.go
@@ -65,6 +65,10 @@ static inline void CgoWebViewSetTitle(void *w, char *title) {
 	webview_set_title((struct webview *)w, title);
 }

+static inline void CgoWebViewFocus(void *w) {
+	webview_focus((struct webview *)w);
+}
+
 static inline void CgoWebViewSetFullscreen(void *w, int fullscreen) {
 	webview_set_fullscreen((struct webview *)w, fullscreen);
 }
@@ -170,6 +174,10 @@ type WebView interface {
 	// SetTitle() changes window title. This method must be called from the main
 	// thread only. See Dispatch() for more details.
 	SetTitle(title string)
+
+	// Focus() puts the main window into focus
+	Focus()
+
 	// SetFullscreen() controls window full-screen mode. This method must be
 	// called from the main thread only. See Dispatch() for more details.
 	SetFullscreen(fullscreen bool)
@@ -307,6 +315,10 @@ func (w *webview) SetColor(r, g, b, a uint8) {
 	C.CgoWebViewSetColor(w.w, C.uint8_t(r), C.uint8_t(g), C.uint8_t(b), C.uint8_t(a))
 }

+func (w *webview) Focus() {
+	C.CgoWebViewFocus(w.w)
+}
+
 func (w *webview) SetFullscreen(fullscreen bool) {
 	C.CgoWebViewSetFullscreen(w.w, C.int(boolToInt(fullscreen)))
 }
@@ -353,7 +365,9 @@ func _webviewDispatchGoCallback(index unsafe.Pointer) {
 	f = fns[uintptr(index)]
 	delete(fns, uintptr(index))
 	m.Unlock()
-	f()
+	if f != nil {
+		f()
+	}
 }

 //export _webviewExternalInvokeCallback
@@ -369,5 +383,7 @@ func _webviewExternalInvokeCallback(w unsafe.Pointer, data unsafe.Pointer) {
 		}
 	}
 	m.Unlock()
-	cb(wv, C.GoString((*C.char)(data)))
+	if cb != nil {
+		cb(wv, C.GoString((*C.char)(data)))
+	}
 }
--- a/lib/renderer/webview/webview.h
+++ b/lib/renderer/webview/webview.h
@@ -168,6 +168,7 @@ struct webview_priv
  WEBVIEW_API int webview_eval(struct webview *w, const char *js);
  WEBVIEW_API int webview_inject_css(struct webview *w, const char *css);
  WEBVIEW_API void webview_set_title(struct webview *w, const char *title);
+  WEBVIEW_API void webview_focus(struct webview *w);
  WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen);
  WEBVIEW_API void webview_set_color(struct webview *w, uint8_t r, uint8_t g,
                                     uint8_t b, uint8_t a);
@@ -364,6 +365,7 @@ struct webview_priv
          webkit_web_view_get_settings(WEBKIT_WEB_VIEW(w->priv.webview));
      webkit_settings_set_enable_write_console_messages_to_stdout(settings, true);
      webkit_settings_set_enable_developer_extras(settings, true);
+      webkit_settings_set_hardware_acceleration_policy(settings, WEBKIT_HARDWARE_ACCELERATION_POLICY_ALWAYS);
    }
    else
    {
@@ -395,6 +397,11 @@ struct webview_priv
    gtk_window_set_title(GTK_WINDOW(w->priv.window), title);
  }

+  WEBVIEW_API void webview_focus(struct webview *w)
+  {
+    gtk_window_present(GTK_WINDOW(w->priv.window))
+  }
+
  WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen)
  {
    if (fullscreen)
@@ -1640,6 +1647,11 @@ struct webview_priv
 #endif
  }

+  WEBVIEW_API void webview_focus(struct webview *w)
+  {
+    SetFocus(w->priv.hwnd);
+  }
+
  WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen)
  {
    if (w->priv.is_fullscreen == !!fullscreen)
@@ -2207,6 +2219,11 @@ struct webview_priv
    [w->priv.window setTitle:nsTitle];
  }

+  WEBVIEW_API void webview_focus(struct webview *w)
+  {
+    [w->priv.window makeKeyWindow];
+  }
+
  WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen)
  {
    int b = ((([w->priv.window styleMask] & NSWindowStyleMaskFullScreen) ==
--- a/pace.jpeg
+++ b/pace.jpeg
--- a/runtime/assets/default.html
+++ b/runtime/assets/default.html
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-</head>
-
-<body>
-  <div id="app"></div>
-  <script type="text/javascript">function AddScript(js, callbackID) {
-      var script = document.createElement('script');
-      script.text = js;
-      document.body.appendChild(script);
-    }</script>
-</body>
-
-</html>
--- a/runtime/assets/wails.js
+++ b/runtime/assets/wails.js
--- a/runtime/events.go
+++ b/runtime/events.go
@@ -19,6 +19,16 @@ func (r *Events) On(eventName string, callback func(optionalData ...interface{})
 	r.eventManager.On(eventName, callback)
 }

+// Once pass through
+func (r *Events) Once(eventName string, callback func(optionalData ...interface{})) {
+	r.eventManager.Once(eventName, callback)
+}
+
+// OnMultiple pass through
+func (r *Events) OnMultiple(eventName string, callback func(optionalData ...interface{}), counter uint) {
+	r.eventManager.OnMultiple(eventName, callback, counter)
+}
+
 // Emit pass through
 func (r *Events) Emit(eventName string, optionalData ...interface{}) {
 	r.eventManager.Emit(eventName, optionalData...)
--- a/runtime/js/core/main.js
+++ b/runtime/js/core/main.js
@@ -13,7 +13,7 @@ import * as Browser from './browser';
 import { On, OnMultiple, Emit, Notify, Heartbeat, Acknowledge } from './events';
 import { NewBinding } from './bindings';
 import { Callback } from './calls';
-import { AddScript, InjectCSS } from './utils';
+import { AddScript, InjectCSS, InjectFirebug } from './utils';
 import { AddIPCListener } from './ipc';
 import * as Store from './store';

@@ -60,6 +60,11 @@ window.onerror = function (msg, url, lineNo, columnNo, error) {
 	window.wails.Log.Error('error: ' + error);
 };

+// Use firebug?
+if( window.usefirebug ) { 
+	InjectFirebug();
+}
+
 // Emit loaded event
 Emit('wails:loaded');

--- a/runtime/js/core/utils.js
+++ b/runtime/js/core/utils.js
@@ -20,6 +20,18 @@ export function AddScript(js, callbackID) {
 	}
 }

+export function InjectFirebug() {
+	// set the debug attribute on HTML
+	var html = document.getElementsByTagName('html')[0];
+	html.setAttribute('debug', 'true');
+	var firebugURL = 'https://wails.app/assets/js/firebug-lite.js#startOpened=true,disableWhenFirebugActive=false';
+	var script = document.createElement('script');
+	script.src = firebugURL;
+	script.type = 'application/javascript';
+	document.head.appendChild(script);
+	window.wails.Log.Info('Injected firebug');
+}
+
 // Adapted from webview - thanks zserge!
 export function InjectCSS(css) {
 	var elem = document.createElement('style');
--- a/runtime/js/package-lock.json
+++ b/runtime/js/package-lock.json
@@ -3959,9 +3959,9 @@
      "dev": true
    },
    "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
      "dev": true
    },
    "interpret": {
--- a/runtime/js/runtime/package-lock.json
+++ b/runtime/js/runtime/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "@wailsapp/runtime",
-  "version": "1.1.0",
+  "version": "1.1.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -130,9 +130,9 @@
      "dev": true
    },
    "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
      "dev": true
    },
    "invert-kv": {