Merge develop

CONTRIBUTORS.md

@@ -20,4 +20,3 @@ Wails is what it is because of the time and effort given by these great people.
 * [Toyam Cox](https://github.com/Vaelatern)
 * [Robin Eklind](https://github.com/mewmew)
 * [Kris Raney](https://github.com/kraney)
-* [soon cheol shin](https://github.com/scshin0572)

cmd/package.go

@@ -191,15 +191,8 @@ func (b *PackageHelper) PackageWindows(po *ProjectOptions, cleanUp bool) error {
 
 	// Build syso
 	sysofile := filepath.Join(b.fs.Cwd(), basename+"-res.syso")
-
-	batfile, err := fs.LocalDir(".")
-	if err != nil {
-		return err
-	}
-
-	windresBatFile := filepath.Join(batfile.fullPath, "windres.bat")
-	windresCommand := []string{windresBatFile, sysofile, tgtRCFile}
-	err = NewProgramHelper().RunCommandArray(windresCommand)
+	windresCommand := []string{"windres", "-o", sysofile, tgtRCFile}
+	err := NewProgramHelper().RunCommandArray(windresCommand)
 	if err != nil {
 		return err
 	}

cmd/program.go

@@ -128,7 +128,6 @@ func (p *ProgramHelper) RunCommandArray(args []string, dir ...string) error {
 		fmt.Printf("ERROR: Looks like '%s' isn't installed. Please install and try again.", program)
 		return err
 	}
-
 	args = args[1:]
 	var stderr string
 	var stdout string

cmd/version.go

@@ -1,4 +1,4 @@
 package cmd
 
 // Version - Wails version
-const Version = "v0.18.12-pre"
+const Version = "v0.18.10-pre"

cmd/windres.bat

@@ -1 +0,0 @@
-windres.exe -o %1 %2

go.mod

@@ -30,4 +30,4 @@ require (
 	golang.org/x/text v0.3.0
 	gopkg.in/AlecAivazis/survey.v1 v1.8.4
 	gopkg.in/yaml.v3 v3.0.0-20190709130402-674ba3eaed22
-)
+)

lib/renderer/webview/webview.h

@@ -217,21 +217,6 @@ struct webview_priv
     va_end(ap);
   }
 
-  WEBVIEW_API void webview_set_title(struct webview *w, const char *title)
-  {
-  #ifdef UNICODE
-    wchar_t *u16title = webview_to_utf16(title);
-    if (u16title == NULL)
-    {
-      return;
-    }
-    SetWindowText(w->priv.hwnd, u16title);
-    GlobalFree(u16title);
-  #else
-    SetWindowText(w->priv.hwnd, title);
-  #endif
-  }
-
   static int webview_js_encode(const char *s, char *esc, size_t n)
   {
     int r = 1; /* At least one byte for trailing zero */