Merge pull request #4417 from Jacalz/glfw-remove-old-workaround

fyne-io · Nov 27, 2023 · 17e67b0 · 17e67b0
2 parents b4e136b + 529a3d6
commit 17e67b0
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 19 deletions.
diff --git a/internal/driver/glfw/clipboard.go b/internal/driver/glfw/clipboard.go
@@ -16,9 +16,7 @@ import (
 var _ fyne.Clipboard = (*clipboard)(nil)
 
 // clipboard represents the system clipboard
-type clipboard struct {
-	window *glfw.Window
-}
+type clipboard struct{}
 
 // Content returns the clipboard content
 func (c *clipboard) Content() string {
@@ -64,12 +62,6 @@ func (c *clipboard) SetContent(content string) {
 
 func (c *clipboard) setContent(content string) {
 	runOnMain(func() {
-		defer func() {
-			if r := recover(); r != nil {
-				fyne.LogError("GLFW clipboard error (details above)", nil)
-			}
-		}()
-
 		glfw.SetClipboardString(content)
 	})
 }
diff --git a/internal/driver/glfw/loop_desktop.go b/internal/driver/glfw/loop_desktop.go
@@ -26,6 +26,7 @@ func (d *gLDriver) initGLFW() {
 
 func (d *gLDriver) tryPollEvents() {
 	defer func() {
+		// See https://github.com/glfw/glfw/issues/1785 and https://github.com/fyne-io/fyne/issues/1024.
 		if r := recover(); r != nil {
 			fyne.LogError(fmt.Sprint("GLFW poll event error: ", r), nil)
 		}

diff --git a/internal/driver/glfw/loop_goxjs.go b/internal/driver/glfw/loop_goxjs.go
@@ -26,6 +26,7 @@ func (d *gLDriver) initGLFW() {
 
 func (d *gLDriver) tryPollEvents() {
 	defer func() {
+		// See https://github.com/glfw/glfw/issues/1785 and https://github.com/fyne-io/fyne/issues/1024.
 		if r := recover(); r != nil {
 			fyne.LogError(fmt.Sprint("GLFW poll event error: ", r), nil)
 		}

diff --git a/internal/driver/glfw/window.go b/internal/driver/glfw/window.go
@@ -229,14 +229,7 @@ func (w *window) ShowAndRun() {
 
 // Clipboard returns the system clipboard
 func (w *window) Clipboard() fyne.Clipboard {
-	if w.view() == nil {
-		return nil
-	}
-
-	if w.clipboard == nil {
-		w.clipboard = &clipboard{window: w.viewport}
-	}
-	return w.clipboard
+	return &clipboard{}
 }
 
 func (w *window) Content() fyne.CanvasObject {

diff --git a/internal/driver/glfw/window_desktop.go b/internal/driver/glfw/window_desktop.go
@@ -78,8 +78,6 @@ type window struct {
 	icon         fyne.Resource
 	mainmenu     *fyne.MainMenu
 
-	clipboard fyne.Clipboard
-
 	master     bool
 	fullScreen bool
 	centered   bool