From bc260b08b25b56d22908d1efbe95073266b32625 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Sat, 21 Nov 2020 12:40:19 +1100 Subject: [PATCH] Better devtools handling --- v2/internal/app/debug.go | 3 +++ v2/internal/app/desktop.go | 2 +- v2/internal/app/hybrid.go | 4 +--- v2/internal/ffenestri/ffenestri.go | 10 ++++------ v2/pkg/options/default.go | 2 +- v2/test/kitchensink/icon.png | Bin 0 -> 6765 bytes 6 files changed, 10 insertions(+), 11 deletions(-) create mode 100644 v2/test/kitchensink/icon.png diff --git a/v2/internal/app/debug.go b/v2/internal/app/debug.go index f6d70105..7bcabc3c 100644 --- a/v2/internal/app/debug.go +++ b/v2/internal/app/debug.go @@ -4,6 +4,9 @@ package app // Init initialises the application for a debug environment func (a *App) Init() error { + // Indicate debug mode a.debug = true + // Enable dev tools + a.options.DevTools = true return nil } diff --git a/v2/internal/app/desktop.go b/v2/internal/app/desktop.go index 3a42a993..79ea71a3 100644 --- a/v2/internal/app/desktop.go +++ b/v2/internal/app/desktop.go @@ -142,7 +142,7 @@ func (a *App) Run() error { return err } - result := a.window.Run(dispatcher, bindingDump) + result := a.window.Run(dispatcher, bindingDump, a.debug) a.logger.Trace("Ffenestri.Run() exited") a.servicebus.Stop() diff --git a/v2/internal/app/hybrid.go b/v2/internal/app/hybrid.go index f39e7d64..d273e261 100644 --- a/v2/internal/app/hybrid.go +++ b/v2/internal/app/hybrid.go @@ -64,9 +64,7 @@ func CreateApp(options *Options) *App { MaxWidth: options.MaxWidth, MaxHeight: options.MaxHeight, StartHidden: options.StartHidden, - - // This should be controlled by the compile time flags... - DevTools: true, + DevTools: options.DevTools, Resizable: !options.DisableResize, Fullscreen: options.Fullscreen, diff --git a/v2/internal/ffenestri/ffenestri.go b/v2/internal/ffenestri/ffenestri.go index 0a0cfef9..86f56bc0 100644 --- a/v2/internal/ffenestri/ffenestri.go +++ b/v2/internal/ffenestri/ffenestri.go @@ -25,10 +25,6 @@ import ( */ import "C" -// DEBUG is the global Ffenestri debug flag. -// TODO: move to compile time. -var DEBUG bool = true - // Application is our main application object type Application struct { config *options.App @@ -108,7 +104,7 @@ func intToColour(colour int) (C.int, C.int, C.int, C.int) { } // Run the application -func (a *Application) Run(incomingDispatcher Dispatcher, bindings string) error { +func (a *Application) Run(incomingDispatcher Dispatcher, bindings string, debug bool) error { title := a.string2CString(a.config.Title) width := C.int(a.config.Width) height := C.int(a.config.Height) @@ -117,6 +113,8 @@ func (a *Application) Run(incomingDispatcher Dispatcher, bindings string) error fullscreen := a.bool2Cint(a.config.Fullscreen) startHidden := a.bool2Cint(a.config.StartHidden) logLevel := C.int(a.config.LogLevel) + println("debug = ", debug) + println("devtools = ", a.config.DevTools) app := C.NewApplication(title, width, height, resizable, devtools, fullscreen, startHidden, logLevel) // Save app reference @@ -133,7 +131,7 @@ func (a *Application) Run(incomingDispatcher Dispatcher, bindings string) error C.SetMaxWindowSize(a.app, maxWidth, maxHeight) // Set debug if needed - C.SetDebug(app, a.bool2Cint(DEBUG)) + C.SetDebug(app, a.bool2Cint(debug)) // TODO: Move frameless to Linux options // if a.config.Frameless { diff --git a/v2/pkg/options/default.go b/v2/pkg/options/default.go index 90f11ce0..46341685 100644 --- a/v2/pkg/options/default.go +++ b/v2/pkg/options/default.go @@ -10,7 +10,7 @@ var Default = &App{ Title: "My Wails App", Width: 1024, Height: 768, - DevTools: true, + DevTools: false, RGBA: 0xFFFFFFFF, Mac: &mac.Options{ TitleBar: mac.TitleBarDefault(), diff --git a/v2/test/kitchensink/icon.png b/v2/test/kitchensink/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a2b304154044f39db7f59fe497728f64bf4d551f GIT binary patch literal 6765 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