Skip to content

feat: add resource window #187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 11, 2019
Merged

feat: add resource window #187

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a86a520
feat: add resource window
pchampio Jul 10, 2019
15df2ef
chore: add warning message when the resource fails
pchampio Jul 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 30 additions & 5 deletions application.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ func Run(opt ...Option) (err error) {

// Application provides the flutter engine in a user friendly matter.
type Application struct {
config config
engine *embedder.FlutterEngine
window *glfw.Window
config config
engine *embedder.FlutterEngine
window *glfw.Window
resourceWindow *glfw.Window
}

// NewApplication creates a new application with provided options.
Expand All @@ -45,7 +46,6 @@ func NewApplication(opt ...Option) *Application {
opt = append(opt, AddPlugin(defaultPlatformPlugin))
opt = append(opt, AddPlugin(defaultTextinputPlugin))
opt = append(opt, AddPlugin(defaultLifecyclePlugin))

opt = append(opt, AddPlugin(defaultKeyeventsPlugin))

// apply all configs
Expand All @@ -56,6 +56,20 @@ func NewApplication(opt ...Option) *Application {
return app
}

// createResourceWindow creates an invisible GLFW window that shares the 'view'
// window's resource context. This window is used to upload resources in the
// background. Must be call after the 'view' window is created.
func createResourceWindow(window *glfw.Window) (*glfw.Window, error) {
glfw.WindowHint(glfw.Decorated, glfw.False)
glfw.WindowHint(glfw.Visible, glfw.False)
resourceWindow, err := glfw.CreateWindow(1, 1, "", nil, window)
if err != nil {
return nil, errors.Wrap(err, "error creating the resource window")
}
glfw.DefaultWindowHints()
return resourceWindow, nil
}

// Run starts the application and waits for it to finish.
func (a *Application) Run() error {
runtime.LockOSThread()
Expand Down Expand Up @@ -92,6 +106,13 @@ func (a *Application) Run() error {
glfw.DefaultWindowHints()
defer a.window.Destroy()

a.resourceWindow, err = createResourceWindow(a.window)
if err != nil {
fmt.Printf("go-flutter: WARNING %v\n", err)
} else {
defer a.resourceWindow.Destroy()
}

if a.config.windowIconProvider != nil {
images, err := a.config.windowIconProvider()
if err != nil {
Expand Down Expand Up @@ -171,7 +192,11 @@ func (a *Application) Run() error {
return 0
}
a.engine.GLMakeResourceCurrent = func() bool {
return false
if a.resourceWindow == nil {
return false
}
a.resourceWindow.MakeContextCurrent()
return true
}
a.engine.GLProcResolver = func(procName string) unsafe.Pointer {
return glfw.GetProcAddress(procName)
Expand Down