Compare commits

..

11 Commits

Author SHA1 Message Date
Lea Anthony
ff666379fd Merge branch '261-korean-fonts' of github.com:wailsapp/wails into 261-korean-fonts 2019-10-25 18:11:52 +11:00
Lea Anthony
69000a0afb fix: re-add webview_set_title 2019-10-25 18:10:25 +11:00
Lea Anthony
dd43737b82 merge develop 2019-10-25 17:42:34 +11:00
Lea Anthony
52e6091f0f release v0.18.11-pre 2019-10-25 17:39:12 +11:00
Lea Anthony
2db1624faf 274 support spaces in windows paths (#275)
* fix: escape windows commands

* fix: allow spaces in path to windres

* Update go.mod
2019-10-25 17:37:36 +11:00
Lea Anthony
061c3a6cca Merge branch 'develop' into 261-korean-fonts 2019-10-25 12:25:22 +11:00
Lea Anthony
226b02646b fix: unicode text for Windows 2019-10-25 12:24:20 +11:00
Lea Anthony
2e9e6a398a chore: bump version 2019-10-24 08:53:54 +11:00
Lea Anthony
cd3865038b fix: linting 2019-10-24 08:52:43 +11:00
Lea Anthony
9e6d6763ec Merge branch 'develop' into 261-korean-fonts 2019-10-23 21:37:13 +11:00
Lea Anthony
e0856b8bfc fix: detect encoding on windows 2019-10-23 21:29:40 +11:00
7 changed files with 29 additions and 4 deletions

View File

@@ -20,3 +20,4 @@ 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)

View File

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

View File

@@ -128,6 +128,7 @@ 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

View File

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

1
cmd/windres.bat Normal file
View File

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

2
go.mod
View File

@@ -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
)
)

View File

@@ -217,6 +217,21 @@ 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 */