Quietly begin wayland testing

fyne-io · Nov 23, 2020 · c9aa6fd · c9aa6fd
1 parent b66d550
commit c9aa6fd
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/internal/driver/glfw/driver.go b/internal/driver/glfw/driver.go
@@ -15,8 +15,11 @@ import (
 
 const mainGoroutineID = 1
 
-var canvasMutex sync.RWMutex
-var canvases = make(map[fyne.CanvasObject]fyne.Canvas)
+var (
+	canvasMutex sync.RWMutex
+	canvases    = make(map[fyne.CanvasObject]fyne.Canvas)
+	isWayland   = false
+)
 
 // Declare conformity with Driver
 var _ fyne.Driver = (*gLDriver)(nil)

diff --git a/internal/driver/glfw/driver_wayland.go b/internal/driver/glfw/driver_wayland.go
@@ -0,0 +1,7 @@
+// +build wayland
+
+package glfw
+
+func init() {
+	isWayland = true
+}
diff --git a/internal/driver/glfw/window.go b/internal/driver/glfw/window.go
@@ -160,6 +160,10 @@ func (w *window) screenSize(canvasSize fyne.Size) (int, int) {
 }
 
 func (w *window) RequestFocus() {
+	if isWayland {
+		return
+	}
+
 	w.runOnMainWhenCreated(w.viewport.Focus)
 }
 
@@ -1185,8 +1189,10 @@ func (d *gLDriver) createWindow(title string, decorate bool) fyne.Window {
 
 func (w *window) create() {
 	runOnMain(func() {
-		// make the window hidden, we will set it up and then show it later
-		glfw.WindowHint(glfw.Visible, 0)
+		if !isWayland {
+			// make the window hidden, we will set it up and then show it later
+			glfw.WindowHint(glfw.Visible, 0)
+		}
 		if w.decorate {
 			glfw.WindowHint(glfw.Decorated, 1)
 		} else {