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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 KT-G@yGywn=%3+TH literal 0 HcmV?d00001