debugui: refactoring

Author: hajimehoshi

control.go

@@ -208,8 +208,7 @@ func (c *Context) Text(text string) {
 	})
 }
 
-func (c *Context) button(label string, opt option, callerPC uintptr) (controlID, bool, error) {
-	id := c.idFromCaller(callerPC)
+func (c *Context) button(label string, opt option, id controlID) (bool, error) {
 	res, err := c.control(id, opt, func(bounds image.Rectangle, wasFocused bool) (bool, error) {
 		var res bool
 		// handle click
@@ -224,9 +223,9 @@ func (c *Context) button(label string, opt option, callerPC uintptr) (controlID,
 		return res, nil
 	})
 	if err != nil {
-		return emptyControlID, false, err
+		return false, err
 	}
-	return id, res, nil
+	return res, nil
 }
 
 // Checkbox creates a checkbox with the given boolean state and text label.
@@ -356,8 +355,7 @@ func (c *Context) sliderF(value *float64, low, high, step float64, digits int, i
 	return res, nil
 }
 
-func (c *Context) header(label string, isTreeNode bool, opt option, callerPC uintptr, f func() error) error {
-	id := c.idFromCaller(callerPC)
+func (c *Context) header(label string, isTreeNode bool, opt option, id controlID, f func() error) error {
 	c.SetGridLayout(nil, nil)
 
 	var expanded bool
@@ -406,8 +404,8 @@ func (c *Context) header(label string, isTreeNode bool, opt option, callerPC uin
 	return nil
 }
 
-func (c *Context) treeNode(label string, opt option, callerPC uintptr, f func()) error {
-	if err := c.header(label, true, opt, callerPC, func() (err error) {
+func (c *Context) treeNode(label string, opt option, id controlID, f func()) error {
+	if err := c.header(label, true, opt, id, func() (err error) {
 		l, err := c.layout()
 		if err != nil {
 			return err

debugui_test.go

@@ -17,7 +17,7 @@ func TestMultipleButtonsInForLoop(t *testing.T) {
 		ctx.Window("Window", image.Rect(0, 0, 100, 100), func(layout debugui.ContainerLayout) {
 			var id debugui.ControlID
 			for range 10 {
-				id2 := ctx.ButtonID("a")
+				id2 := ctx.IDFromCaller()
 				if id2 == debugui.EmptyControlID {
 					t.Errorf("Caller() returned 0")
 					continue
@@ -44,12 +44,12 @@ func TestMultipleButtonsOnOneLine(t *testing.T) {
 	var d debugui.DebugUI
 	if err := d.Update(func(ctx *debugui.Context) error {
 		ctx.Window("Window", image.Rect(0, 0, 100, 100), func(layout debugui.ContainerLayout) {
-			idA1 := ctx.ButtonID("a")
-			idA2 := ctx.ButtonID("a")
+			idA1 := ctx.IDFromCaller()
+			idA2 := ctx.IDFromCaller()
 			if idA1 == idA2 {
 				t.Errorf("Button() returned the same value twice: %q", idA1)
 			}
-			idB1, idB2 := ctx.ButtonID("b"), ctx.ButtonID("b")
+			idB1, idB2 := ctx.IDFromCaller(), ctx.IDFromCaller()
 			if idB1 == idB2 {
 				t.Errorf("Button() returned the same value twice: %q", idB1)
 			}

export_test.go

@@ -7,18 +7,9 @@ type ControlID = controlID
 
 const EmptyControlID = emptyControlID
 
-func (c *Context) ButtonID(label string) ControlID {
+func (c *Context) IDFromCaller() ControlID {
 	pc := caller()
-	var id controlID
-	c.wrapError(func() error {
-		var err error
-		id, _, err = c.button(label, optionAlignCenter, pc)
-		if err != nil {
-			return err
-		}
-		return nil
-	})
-	return id
+	return c.idFromCaller(pc)
 }
 
 func (d *DebugUI) ContainerCounter() int {

widget.go

@@ -12,10 +12,11 @@ package debugui
 // If you want to generate different controls with the same function call in a loop (such as a for loop), use [IDScope].
 func (c *Context) Button(label string) bool {
 	pc := caller()
+	id := c.idFromCaller(pc)
 	var res bool
 	c.wrapError(func() error {
 		var err error
-		_, res, err = c.button(label, optionAlignCenter, pc)
+		res, err = c.button(label, optionAlignCenter, id)
 		if err != nil {
 			return err
 		}
@@ -84,12 +85,13 @@ func (c *Context) SliderF(value *float64, lo, hi float64, step float64, digits i
 // If you want to generate different controls with the same function call in a loop (such as a for loop), use [IDScope].
 func (c *Context) Header(label string, initialExpansion bool, f func()) {
 	pc := caller()
+	id := c.idFromCaller(pc)
 	c.wrapError(func() error {
 		var opt option
 		if initialExpansion {
 			opt |= optionExpanded
 		}
-		if err := c.header(label, false, opt, pc, func() error {
+		if err := c.header(label, false, opt, id, func() error {
 			f()
 			return nil
 		}); err != nil {
@@ -106,8 +108,9 @@ func (c *Context) Header(label string, initialExpansion bool, f func()) {
 // If you want to generate different controls with the same function call in a loop (such as a for loop), use [IDScope].
 func (c *Context) TreeNode(label string, f func()) {
 	pc := caller()
+	id := c.idFromCaller(pc)
 	c.wrapError(func() error {
-		if err := c.treeNode(label, 0, pc, f); err != nil {
+		if err := c.treeNode(label, 0, id, f); err != nil {
 			return err
 		}
 		return nil