Fix copyable for new gio api

psanford · Nov 30, 2024 · 748fea5 · 748fea5
1 parent a9fe7b9
commit 748fea5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/ui/copyable.go b/ui/copyable.go
@@ -1,6 +1,9 @@
 package ui
 
 import (
+	"io"
+	"strings"
+
 	"gioui.org/io/clipboard"
 	"gioui.org/layout"
 	"gioui.org/unit"
@@ -30,10 +33,11 @@ func (c *Copyable) Text() string {
 func (r *Copyable) Layout(gtx C) D {
 	// if the copy button was clicked, write the contents of the editor
 	// into the system clipboard.
-	if r.copyButton.Clicked() {
-		clipboard.WriteOp{
-			Text: r.text,
-		}.Add(gtx.Ops)
+	if r.copyButton.Clicked(gtx) {
+		gtx.Execute(clipboard.WriteCmd{
+			Type: "application/text",
+			Data: io.NopCloser(strings.NewReader(r.text)),
+		})
 	}
 
 	return D{}

diff --git a/ui/ui.go b/ui/ui.go
@@ -542,7 +542,7 @@ func (ui *UI) sendFile(ctx context.Context, w *app.Window, path, filename string
 
 var (
 	textMsgEditor = new(RichEditor)
-	textCodeTxt   = new(widget.Editor)
+	textCodeTxt   = new(Copyable)
 	sendTextBtn   = new(widget.Clickable)
 
 	rendezvousEditor = &widget.Editor{
@@ -567,12 +567,12 @@ var (
 	recvCodeEditor = new(RichEditor)
 	recvMsgBtn     = new(widget.Clickable)
 	scanQRBtn      = new(widget.Clickable)
-	recvTxtMsg     = new(widget.Editor)
+	recvTxtMsg     = new(Copyable)
 	itemList       = &layout.List{
 		Axis: layout.Vertical,
 	}
 
-	sendFileCodeTxt = new(widget.Editor)
+	sendFileCodeTxt = new(Copyable)
 	sendFileBtn     = new(widget.Clickable)
 
 	topLabel = "Wormhole William"
@@ -700,8 +700,7 @@ var sendTextTab = Tab{
 			func(gtx C) D {
 				if textCodeTxt.Text() != "" {
 					gtx.Constraints.Max.Y = gtx.Dp(400)
-					// XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-					return material.Editor(th, textCodeTxt, "").Layout(gtx)
+					return CopyField(th, textCodeTxt).Layout(gtx)
 				}
 				return D{}
 			},
@@ -758,9 +757,7 @@ var recvTab = Tab{
 			},
 			func(gtx C) D {
 				gtx.Constraints.Max.Y = gtx.Dp(200)
-				return material.Editor(th, recvTxtMsg, "").Layout(gtx)
-				// XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-				// return CopyField(th, recvTxtMsg).Layout(gtx, th.Shaper, font.Font{}, unit.Sp(12), op.CallOp{}, op.CallOp{})
+				return CopyField(th, recvTxtMsg).Layout(gtx)
 			},
 		}
 
@@ -815,9 +812,7 @@ var sendFileTab = Tab{
 			},
 			func(gtx C) D {
 				gtx.Constraints.Max.Y = gtx.Dp(400)
-				return material.Editor(th, sendFileCodeTxt, "").Layout(gtx)
-				// XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-				// return CopyField(th, sendFileCodeTxt).Layout(gtx, th.Shaper, font.Font{}, unit.Sp(12), op.CallOp{}, op.CallOp{})
+				return CopyField(th, sendFileCodeTxt).Layout(gtx)
 			},
 			func(gtx C) D {
 				if transferInProgress || confirmInProgress {