taigrr/wails
1
0
Fork 0
mirror of https://github.com/taigrr/wails.git synced 2026-04-15 11:21:15 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Lea Anthony
2021-04-17 08:28:59 +10:00
parent 94bed2a093 f34fc9c654
commit cecbb38c64
12 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/renderer/webview.go
View File

@@ -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())
if err != nil {
return err
color := config.GetColour()
if color != "" {
err := w.SetColour(color)
if err != nil {
return err
}
}
w.log.Info("Initialised")

7
lib/renderer/webview/webview.h
View File

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