More feature flag removal

This commit is contained in:
Lea Anthony
2020-09-14 07:05:35 +10:00
committed by Travis McLane
parent bfa8929c47
commit 93ec65be6a
6 changed files with 3 additions and 37 deletions

View File

@@ -9,8 +9,6 @@ package app
import (
"os"
"github.com/wailsapp/wails/v2/internal/features"
)
// App defines a Wails application structure
@@ -22,8 +20,6 @@ type App struct {
// Indicates if the app is running in debug mode
debug bool
Features *features.Features
}
// CreateApp returns a null application

View File

@@ -6,7 +6,6 @@ import (
"os"
"github.com/wailsapp/wails/v2/internal/binding"
"github.com/wailsapp/wails/v2/internal/features"
"github.com/wailsapp/wails/v2/internal/ffenestri"
"github.com/wailsapp/wails/v2/internal/logger"
"github.com/wailsapp/wails/v2/internal/messagedispatcher"
@@ -35,9 +34,6 @@ type App struct {
// This is our binding DB
bindings *binding.Bindings
// Feature flags
Features *features.Features
}
// Create App
@@ -73,7 +69,6 @@ func CreateApp(options *Options) *App {
servicebus: servicebus.New(myLogger),
logger: myLogger,
bindings: binding.NewBindings(myLogger),
Features: features.New(),
}
// Initialise the app
@@ -152,7 +147,7 @@ func (a *App) Run() error {
return err
}
result := a.window.Run(dispatcher, bindingDump, a.Features)
result := a.window.Run(dispatcher, bindingDump)
a.logger.Trace("Ffenestri.Run() exited")
a.servicebus.Stop()

View File

@@ -8,7 +8,6 @@ import (
"github.com/leaanthony/clir"
"github.com/wailsapp/wails/v2/internal/binding"
"github.com/wailsapp/wails/v2/internal/features"
"github.com/wailsapp/wails/v2/internal/ffenestri"
"github.com/wailsapp/wails/v2/internal/logger"
"github.com/wailsapp/wails/v2/internal/messagedispatcher"
@@ -44,9 +43,6 @@ type App struct {
servicebus *servicebus.ServiceBus
debug bool
// Feature flags
Features *features.Features
}
// Create App
@@ -191,7 +187,7 @@ func (a *App) Run() error {
}
}()
result := a.window.Run(dispatcher, bindingDump, a.Features)
result := a.window.Run(dispatcher, bindingDump)
a.servicebus.Stop()
return result

View File

@@ -1,10 +0,0 @@
package features
type Features struct {
}
// New creates a new Features object
func New() *Features {
return &Features{
}
}

View File

@@ -1,10 +0,0 @@
package features
type Features struct {
}
// New creates a new Features object
func New() *Features {
return &Features{
}
}

View File

@@ -5,7 +5,6 @@ import (
"strings"
"unsafe"
"github.com/wailsapp/wails/v2/internal/features"
"github.com/wailsapp/wails/v2/internal/logger"
"github.com/wailsapp/wails/v2/internal/messagedispatcher"
)
@@ -127,7 +126,7 @@ type DispatchClient interface {
}
// Run the application
func (a *Application) Run(incomingDispatcher Dispatcher, bindings string, features *features.Features) error {
func (a *Application) Run(incomingDispatcher Dispatcher, bindings string) error {
title := a.string2CString(a.config.Title)
width := C.int(a.config.Width)
height := C.int(a.config.Height)