Remove clipboard from the Driver intterface

fyne-io · Sep 9, 2024 · f4cbbdd · f4cbbdd
1 parent 55c6d11
commit f4cbbdd
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 36 deletions.
diff --git a/app/app.go b/app/app.go
@@ -19,9 +19,10 @@ import (
 var _ fyne.App = (*fyneApp)(nil)
 
 type fyneApp struct {
-	driver   fyne.Driver
-	icon     fyne.Resource
-	uniqueID string
+	driver    fyne.Driver
+	clipboard fyne.Clipboard
+	icon      fyne.Resource
+	uniqueID  string
 
 	cloud     fyne.CloudProvider
 	lifecycle app.Lifecycle
@@ -110,7 +111,7 @@ func (a *fyneApp) newDefaultPreferences() *preferences {
 }
 
 func (a *fyneApp) Clipboard() fyne.Clipboard {
-	return a.Driver().Clipboard()
+	return a.clipboard
 }
 
 // New returns a new application instance with the default driver and no unique ID (unless specified in FyneApp.toml)
@@ -141,8 +142,8 @@ func makeStoreDocs(id string, s *store) *internal.Docs {
 	}
 }
 
-func newAppWithDriver(d fyne.Driver, id string) fyne.App {
-	newApp := &fyneApp{uniqueID: id, driver: d}
+func newAppWithDriver(d fyne.Driver, clipboard fyne.Clipboard, id string) fyne.App {
+	newApp := &fyneApp{uniqueID: id, clipboard: clipboard, driver: d}
 	fyne.SetCurrentApp(newApp)
 
 	newApp.prefs = newApp.newDefaultPreferences()

diff --git a/app/app_gl.go b/app/app_gl.go
@@ -10,5 +10,5 @@ import (
 // NewWithID returns a new app instance using the appropriate runtime driver.
 // The ID string should be globally unique to this app.
 func NewWithID(id string) fyne.App {
-	return newAppWithDriver(glfw.NewGLDriver(), id)
+	return newAppWithDriver(glfw.NewGLDriver(), &glfw.Clipboard{}, id)
 }
diff --git a/app/app_mobile.go b/app/app_mobile.go
@@ -12,7 +12,7 @@ import (
 // The ID string should be globally unique to this app.
 func NewWithID(id string) fyne.App {
 	d := mobile.NewGoMobileDriver()
-	a := newAppWithDriver(d, id)
+	a := newAppWithDriver(d, &mobile.MobileClipboard{}, id)
 	d.(mobile.ConfiguredDriver).SetOnConfigurationChanged(func(c *mobile.Configuration) {
 		internalapp.SystemTheme = c.SystemTheme
 

diff --git a/driver.go b/driver.go
@@ -43,9 +43,4 @@ type Driver interface {
 	//
 	// Since: 2.5
 	SetDisableScreenBlanking(bool)
-
-	// Clipboard returns the system clipboard.
-	//
-	// Since: 2.6
-	Clipboard() Clipboard
 }
diff --git a/internal/driver/glfw/clipboard.go b/internal/driver/glfw/clipboard.go
@@ -12,13 +12,13 @@ import (
 )
 
 // Declare conformity with Clipboard interface
-var _ fyne.Clipboard = (*clipboard)(nil)
+var _ fyne.Clipboard = (*Clipboard)(nil)
 
-// clipboard represents the system clipboard
-type clipboard struct{}
+// Clipboard represents the system Clipboard
+type Clipboard struct{}
 
 // Content returns the clipboard content
-func (c *clipboard) Content() string {
+func (c *Clipboard) Content() string {
 	// This retry logic is to work around the "Access Denied" error often thrown in windows PR#1679
 	if runtime.GOOS != "windows" {
 		return c.content()
@@ -34,7 +34,7 @@ func (c *clipboard) Content() string {
 	return ""
 }
 
-func (c *clipboard) content() string {
+func (c *Clipboard) content() string {
 	content := ""
 	runOnMain(func() {
 		content = glfw.GetClipboardString()
@@ -43,7 +43,7 @@ func (c *clipboard) content() string {
 }
 
 // SetContent sets the clipboard content
-func (c *clipboard) SetContent(content string) {
+func (c *Clipboard) SetContent(content string) {
 	// This retry logic is to work around the "Access Denied" error often thrown in windows PR#1679
 	if runtime.GOOS != "windows" {
 		c.setContent(content)
@@ -59,7 +59,7 @@ func (c *clipboard) SetContent(content string) {
 	fyne.LogError("GLFW clipboard set failed", nil)
 }
 
-func (c *clipboard) setContent(content string) {
+func (c *Clipboard) setContent(content string) {
 	runOnMain(func() {
 		glfw.SetClipboardString(content)
 	})

diff --git a/internal/driver/glfw/driver.go b/internal/driver/glfw/driver.go
@@ -68,10 +68,6 @@ func toOSIcon(icon []byte) ([]byte, error) {
 	return buf.Bytes(), nil
 }
 
-func (d *gLDriver) Clipboard() fyne.Clipboard {
-	return &clipboard{}
-}
-
 func (d *gLDriver) RenderedTextSize(text string, textSize float32, style fyne.TextStyle, source fyne.Resource) (size fyne.Size, baseline float32) {
 	return painter.RenderedTextSize(text, textSize, style, source)
 }

diff --git a/internal/driver/glfw/window.go b/internal/driver/glfw/window.go
@@ -237,7 +237,7 @@ func (w *window) ShowAndRun() {
 
 // Clipboard returns the system clipboard
 func (w *window) Clipboard() fyne.Clipboard {
-	return &clipboard{}
+	return &Clipboard{}
 }
 
 func (w *window) Content() fyne.CanvasObject {

diff --git a/internal/driver/mobile/clipboard.go b/internal/driver/mobile/clipboard.go
@@ -5,8 +5,8 @@ import (
 )
 
 // Declare conformity with Clipboard interface
-var _ fyne.Clipboard = (*mobileClipboard)(nil)
+var _ fyne.Clipboard = (*MobileClipboard)(nil)
 
-// mobileClipboard represents the system mobileClipboard
-type mobileClipboard struct {
+// MobileClipboard represents the system MobileClipboard
+type MobileClipboard struct {
 }
diff --git a/internal/driver/mobile/clipboard_android.go b/internal/driver/mobile/clipboard_android.go
@@ -18,7 +18,7 @@ import (
 )
 
 // Content returns the clipboard content for Android
-func (c *mobileClipboard) Content() string {
+func (c *MobileClipboard) Content() string {
 	content := ""
 	app.RunOnJVM(func(vm, env, ctx uintptr) error {
 		chars := C.getClipboardContent(C.uintptr_t(vm), C.uintptr_t(env), C.uintptr_t(ctx))
@@ -34,7 +34,7 @@ func (c *mobileClipboard) Content() string {
 }
 
 // SetContent sets the clipboard content for Android
-func (c *mobileClipboard) SetContent(content string) {
+func (c *MobileClipboard) SetContent(content string) {
 	contentStr := C.CString(content)
 	defer C.free(unsafe.Pointer(contentStr))
 

diff --git a/internal/driver/mobile/clipboard_desktop.go b/internal/driver/mobile/clipboard_desktop.go
@@ -5,12 +5,12 @@ package mobile
 import "fyne.io/fyne/v2"
 
 // Content returns the clipboard content for mobile simulator runs
-func (c *mobileClipboard) Content() string {
+func (c *MobileClipboard) Content() string {
 	fyne.LogError("Clipboard is not supported in mobile simulation", nil)
 	return ""
 }
 
 // SetContent sets the clipboard content for mobile simulator runs
-func (c *mobileClipboard) SetContent(content string) {
+func (c *MobileClipboard) SetContent(content string) {
 	fyne.LogError("Clipboard is not supported in mobile simulation", nil)
 }
diff --git a/internal/driver/mobile/clipboard_ios.go b/internal/driver/mobile/clipboard_ios.go
@@ -15,14 +15,14 @@ import "C"
 import "unsafe"
 
 // Content returns the clipboard content for iOS
-func (c *mobileClipboard) Content() string {
+func (c *MobileClipboard) Content() string {
 	content := C.getClipboardContent()
 
 	return C.GoString(content)
 }
 
 // SetContent sets the clipboard content for iOS
-func (c *mobileClipboard) SetContent(content string) {
+func (c *MobileClipboard) SetContent(content string) {
 	contentStr := C.CString(content)
 	defer C.free(unsafe.Pointer(contentStr))
 

diff --git a/internal/driver/mobile/driver.go b/internal/driver/mobile/driver.go
@@ -101,7 +101,7 @@ func (d *driver) currentWindow() *window {
 }
 
 func (d *driver) Clipboard() fyne.Clipboard {
-	return &mobileClipboard{}
+	return &MobileClipboard{}
 }
 
 func (d *driver) RenderedTextSize(text string, textSize float32, style fyne.TextStyle, source fyne.Resource) (size fyne.Size, baseline float32) {

diff --git a/internal/driver/mobile/window.go b/internal/driver/mobile/window.go
@@ -204,7 +204,7 @@ func (w *window) Canvas() fyne.Canvas {
 
 func (w *window) Clipboard() fyne.Clipboard {
 	if w.clipboard == nil {
-		w.clipboard = &mobileClipboard{}
+		w.clipboard = &MobileClipboard{}
 	}
 	return w.clipboard
 }