diff --git a/internal/driver/glfw/clipboard.go b/internal/driver/glfw/clipboard.go index a0bd540135..41fb2edd07 100644 --- 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/window.go b/internal/driver/glfw/window.go index 971fc486d0..c0f1dd21d3 100644 --- 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 index d04fccd421..48515ed858 100644 --- a/internal/driver/glfw/window_desktop.go +++ b/internal/driver/glfw/window_desktop.go @@ -77,8 +77,6 @@ type window struct { icon fyne.Resource mainmenu *fyne.MainMenu - clipboard fyne.Clipboard - master bool fullScreen bool centered bool