go-gl/glfw v3.3 support (#298)

pchampio · web-flow · commit f67b5ecc8102 · 2020-03-17T16:59:24.000+01:00
* go-gl/glfw v3.3 support * add content scale callback * chore: udpate glfw version tag * feat: custom PixelRatio calculation * revert scaling * update go.mod AWESOME! fixes #373
diff --git a/README.md b/README.md
@@ -81,7 +81,7 @@ Updating Go is simple and Go [seldomly has backwards-incompatible changes](https
 
 ### GLFW version
 
-This project uses go-gl/glfw for GLFW v3.2.
+This project uses go-gl/glfw for GLFW v3.3.
 
 ## License
 
diff --git a/application.go b/application.go
@@ -8,7 +8,7 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/go-gl/glfw/v3.2/glfw"
+	"github.com/go-gl/glfw/v3.3/glfw"
 	"github.com/pkg/errors"
 
 	"github.com/go-flutter-desktop/go-flutter/embedder"
@@ -119,6 +119,7 @@ func (a *Application) Run() error {
 		glfw.WindowHint(glfw.Visible, glfw.False)
 	}
 
+	glfw.WindowHint(glfw.ScaleToMonitor, glfw.True)
 	if a.config.windowAlwaysOnTop {
 		glfw.WindowHint(glfw.Floating, glfw.True)
 	}
@@ -310,7 +311,6 @@ func (a *Application) Run() error {
 			})
 		})
 	})
-	// TODO: when moving to glfw 3.3, also use glfwSetWindowContentScaleCallback
 
 	// Attach glfw window callbacks for text input
 	a.window.SetKeyCallback(
diff --git a/glfw.go b/glfw.go
@@ -8,7 +8,7 @@ import (
 	"unsafe"
 
 	"github.com/go-flutter-desktop/go-flutter/embedder"
-	"github.com/go-gl/glfw/v3.2/glfw"
+	"github.com/go-gl/glfw/v3.3/glfw"
 )
 
 // dpPerInch defines the amount of display pixels per inch as defined for Flutter.
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.12
 require (
 	github.com/davecgh/go-spew v1.1.1
 	github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7
-	github.com/go-gl/glfw v0.0.0-20200222043503-6f7a984d4dc4
+	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.5.1
 )
diff --git a/go.sum b/go.sum
@@ -3,24 +3,14 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 h1:SCYMcCJ89LjRGwEa0tRluNRiMjZHalQZrVrvTbPh+qw=
 github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk=
-github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 h1:QbL/5oDUmRBzO9/Z7Seo6zf912W/a6Sr4Eu0G/3Jho0=
-github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
-github.com/go-gl/glfw v0.0.0-20200221102942-eb749776b5d7 h1:uyLPeqcUL3PEnrv7h5Z+eCoKgx+rIWlgP1SWLwb5J00=
-github.com/go-gl/glfw v0.0.0-20200221102942-eb749776b5d7/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
-github.com/go-gl/glfw v0.0.0-20200222043503-6f7a984d4dc4 h1:5Bg3HS4orH8S9vQARwWJHnEkz0dvhRKf3xxGlyDpjhE=
-github.com/go-gl/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.0 h1:J8lpUdobwIeCI7OiSxHqEwJUKvJwicL5+3v1oe2Yb4k=
-github.com/pkg/errors v0.9.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 h1:WtGNWLvXpe6ZudgnXrq0barxBImvnnJoMEhXAzcbM0I=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.0/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff --git a/internal/opengl/opengl.go b/internal/opengl/opengl.go
@@ -10,7 +10,7 @@ import (
 	"unsafe"
 
 	"github.com/go-gl/gl/v3.3-core/gl"
-	"github.com/go-gl/glfw/v3.2/glfw"
+	"github.com/go-gl/glfw/v3.3/glfw"
 )
 
 // const exposed to go-flutter
diff --git a/key-events.go b/key-events.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/go-flutter-desktop/go-flutter/plugin"
-	"github.com/go-gl/glfw/v3.2/glfw"
+	"github.com/go-gl/glfw/v3.3/glfw"
 )
 
 const keyEventChannelName = "flutter/keyevent"
diff --git a/keyboard.go b/keyboard.go
@@ -1,6 +1,6 @@
 package flutter
 
-import "github.com/go-gl/glfw/v3.2/glfw"
+import "github.com/go-gl/glfw/v3.3/glfw"
 
 // KeyboardQwertyLayout  is the default key for shortcuts (US-layout)
 var KeyboardQwertyLayout = KeyboardShortcuts{
diff --git a/lifecycle.go b/lifecycle.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/go-flutter-desktop/go-flutter/plugin"
-	"github.com/go-gl/glfw/v3.2/glfw"
+	"github.com/go-gl/glfw/v3.3/glfw"
 )
 
 const lifecycleChannelName = "flutter/lifecycle"
diff --git a/option.go b/option.go
@@ -5,7 +5,7 @@ import (
 	"image"
 	"os"
 
-	"github.com/go-gl/glfw/v3.2/glfw"
+	"github.com/go-gl/glfw/v3.3/glfw"
 )
 
 type config struct {
@@ -156,7 +156,7 @@ func WindowDimensionLimits(minWidth, minHeight, maxWidth, maxHeight int) Option
 
 // WindowIcon sets an icon provider func, which is called during window
 // initialization. For tips on the kind of images to provide, see
-// https://godoc.org/github.com/go-gl/glfw/v3.2/glfw#Window.SetIcon
+// https://godoc.org/github.com/go-gl/glfw/v3.3/glfw#Window.SetIcon
 func WindowIcon(iconProivder func() ([]image.Image, error)) Option {
 	return func(c *config) {
 		c.windowIconProvider = iconProivder
diff --git a/platform.go b/platform.go
@@ -3,7 +3,7 @@ package flutter
 import (
 	"encoding/json"
 
-	"github.com/go-gl/glfw/v3.2/glfw"
+	"github.com/go-gl/glfw/v3.3/glfw"
 	"github.com/pkg/errors"
 
 	"github.com/go-flutter-desktop/go-flutter/internal/tasker"
@@ -85,11 +85,8 @@ func (p *platformPlugin) handleClipboardGetData(arguments interface{}) (reply in
 
 	var clipText string
 	p.glfwTasker.Do(func() {
-		clipText, err = p.window.GetClipboardString()
+		clipText = p.window.GetClipboardString()
 	})
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to get string from clipboard")
-	}
 
 	reply = struct {
 		Text string `json:"text"`
diff --git a/plugin.go b/plugin.go
@@ -1,7 +1,7 @@
 package flutter
 
 import (
-	"github.com/go-gl/glfw/v3.2/glfw"
+	"github.com/go-gl/glfw/v3.3/glfw"
 
 	"github.com/go-flutter-desktop/go-flutter/plugin"
 )
diff --git a/pop.go b/pop.go
@@ -1,8 +1,6 @@
 package flutter
 
 import (
-	"fmt"
-
 	"github.com/pkg/errors"
 )
 
@@ -47,14 +45,9 @@ func (p *platformPlugin) handleSystemNavigatorPop(arguments interface{}) (reply
 		})
 		return nil, nil
 	case PopBehaviorIconify:
-		var err error
 		p.glfwTasker.Do(func() {
-			err = p.window.Iconify()
+			p.window.Iconify()
 		})
-		if err != nil {
-			fmt.Printf("go-flutter: error on iconifying window: %v\n", err)
-			return nil, errors.Wrap(err, "failed to iconify window")
-		}
 		return nil, nil
 	case PopBehaviorClose:
 		p.glfwTasker.Do(func() {
diff --git a/textinput.go b/textinput.go
@@ -6,7 +6,7 @@ import (
 	"unicode"
 
 	"github.com/go-flutter-desktop/go-flutter/plugin"
-	"github.com/go-gl/glfw/v3.2/glfw"
+	"github.com/go-gl/glfw/v3.3/glfw"
 	"github.com/pkg/errors"
 )
 
diff --git a/textinput_darwin.go b/textinput_darwin.go
@@ -1,6 +1,6 @@
 package flutter
 
-import "github.com/go-gl/glfw/v3.2/glfw"
+import "github.com/go-gl/glfw/v3.3/glfw"
 
 func (p *keyboardShortcutsGLFW) isModifier() bool {
 	return p.mod&glfw.ModSuper != 0
diff --git a/textinput_linux.go b/textinput_linux.go
@@ -1,6 +1,6 @@
 package flutter
 
-import "github.com/go-gl/glfw/v3.2/glfw"
+import "github.com/go-gl/glfw/v3.3/glfw"
 
 func (p *keyboardShortcutsGLFW) isModifier() bool {
 	return p.mod&glfw.ModControl != 0
diff --git a/textinput_windows.go b/textinput_windows.go
@@ -1,6 +1,6 @@
 package flutter
 
-import "github.com/go-gl/glfw/v3.2/glfw"
+import "github.com/go-gl/glfw/v3.3/glfw"
 
 func (p *keyboardShortcutsGLFW) isModifier() bool {
 	return p.mod&glfw.ModControl != 0
diff --git a/texture-registry.go b/texture-registry.go
@@ -7,7 +7,7 @@ import (
 	"github.com/go-flutter-desktop/go-flutter/embedder"
 	"github.com/go-flutter-desktop/go-flutter/internal/opengl"
 	"github.com/go-flutter-desktop/go-flutter/internal/tasker"
-	"github.com/go-gl/glfw/v3.2/glfw"
+	"github.com/go-gl/glfw/v3.3/glfw"
 	"github.com/pkg/errors"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"unsafe"`
`9`	`9`
`10`	`10`	`"github.com/go-flutter-desktop/go-flutter/embedder"`
`11`		`- "github.com/go-gl/glfw/v3.2/glfw"`
	`11`	`+ "github.com/go-gl/glfw/v3.3/glfw"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`// dpPerInch defines the amount of display pixels per inch as defined for Flutter.`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ go 1.12`
`5`	`5`	`require (`
`6`	`6`	`github.com/davecgh/go-spew v1.1.1`
`7`	`7`	`github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7`
`8`		`- github.com/go-gl/glfw v0.0.0-20200222043503-6f7a984d4dc4`
	`8`	`+ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4`
`9`	`9`	`github.com/pkg/errors v0.9.1`
`10`	`10`	`github.com/stretchr/testify v1.5.1`
`11`	`11`	`)`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"unsafe"`
`11`	`11`
`12`	`12`	`"github.com/go-gl/gl/v3.3-core/gl"`
`13`		`- "github.com/go-gl/glfw/v3.2/glfw"`
	`13`	`+ "github.com/go-gl/glfw/v3.3/glfw"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`// const exposed to go-flutter`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"fmt"`
`6`	`6`
`7`	`7`	`"github.com/go-flutter-desktop/go-flutter/plugin"`
`8`		`- "github.com/go-gl/glfw/v3.2/glfw"`
	`8`	`+ "github.com/go-gl/glfw/v3.3/glfw"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`const keyEventChannelName = "flutter/keyevent"`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`
`6`	`6`	`"github.com/go-flutter-desktop/go-flutter/plugin"`
`7`		`- "github.com/go-gl/glfw/v3.2/glfw"`
	`7`	`+ "github.com/go-gl/glfw/v3.3/glfw"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`const lifecycleChannelName = "flutter/lifecycle"`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package flutter`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/go-gl/glfw/v3.2/glfw"`
	`4`	`+ "github.com/go-gl/glfw/v3.3/glfw"`
`5`	`5`
`6`	`6`	`"github.com/go-flutter-desktop/go-flutter/plugin"`
`7`	`7`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"unicode"`
`7`	`7`
`8`	`8`	`"github.com/go-flutter-desktop/go-flutter/plugin"`
`9`		`- "github.com/go-gl/glfw/v3.2/glfw"`
	`9`	`+ "github.com/go-gl/glfw/v3.3/glfw"`
`10`	`10`	`"github.com/pkg/errors"`
`11`	`11`	`)`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"github.com/go-flutter-desktop/go-flutter/embedder"`
`8`	`8`	`"github.com/go-flutter-desktop/go-flutter/internal/opengl"`
`9`	`9`	`"github.com/go-flutter-desktop/go-flutter/internal/tasker"`
`10`		`- "github.com/go-gl/glfw/v3.2/glfw"`
	`10`	`+ "github.com/go-gl/glfw/v3.3/glfw"`
`11`	`11`	`"github.com/pkg/errors"`
`12`	`12`	`)`
`13`	`13`