debugui: refactoring

Author: hajimehoshi

event.go

@@ -19,20 +19,6 @@ func (o *eventHandler) On(f func()) {
 	}
 }
 
-type preprendedEventHandler struct {
-	e EventHandler
-	f func()
-}
-
-func (o *preprendedEventHandler) On(f func()) {
-	o.e.On(func() {
-		if o.f != nil {
-			o.f()
-		}
-		f()
-	})
-}
-
 type nullEventHandler struct{}
 
 func (n *nullEventHandler) On(func()) {}

slider.go

@@ -50,16 +50,13 @@ func (c *Context) slider(value *int, low, high, step int, id WidgetID, opt optio
 	last := *value
 	v := last
 
-	e, err := c.numberTextField(&v, id)
-	if err != nil {
+	if err := c.numberTextField(&v, id); err != nil {
 		return nil, err
 	}
-	if e != nil {
-		e.On(func() {
-			*value = v
-		})
+	if c.numberEdit == id {
 		return nil, nil
 	}
+	*value = v
 
 	return c.widget(id, opt, func(bounds image.Rectangle, wasFocused bool) (bool, error) {
 		var res bool
@@ -93,16 +90,13 @@ func (c *Context) sliderF(value *float64, low, high, step float64, digits int, i
 	last := *value
 	v := last
 
-	e, err := c.numberTextFieldF(&v, id)
-	if err != nil {
+	if err := c.numberTextFieldF(&v, id); err != nil {
 		return nil, err
 	}
-	if e != nil {
-		e.On(func() {
-			*value = v
-		})
+	if c.numberEdit == id {
 		return nil, nil
 	}
+	*value = v
 
 	return c.widget(id, opt, func(bounds image.Rectangle, wasFocused bool) (bool, error) {
 		var res bool

textfield.go

@@ -152,12 +152,10 @@ func (c *Context) NumberFieldF(value *float64, step float64, digits int) EventHa
 func (c *Context) numberField(value *int, step int, id WidgetID, opt option) (EventHandler, error) {
 	last := *value
 
-	e, err := c.numberTextField(value, id)
-	if err != nil {
+	if err := c.numberTextField(value, id); err != nil {
 		return nil, err
 	}
-	if e != nil {
-		e.On(func() {})
+	if c.numberEdit == id {
 		return nil, nil
 	}
 
@@ -182,12 +180,10 @@ func (c *Context) numberField(value *int, step int, id WidgetID, opt option) (Ev
 func (c *Context) numberFieldF(value *float64, step float64, digits int, id WidgetID, opt option) (EventHandler, error) {
 	last := *value
 
-	oner, err := c.numberTextFieldF(value, id)
-	if err != nil {
+	if err := c.numberTextFieldF(value, id); err != nil {
 		return nil, err
 	}
-	if oner != nil {
-		oner.On(func() {})
+	if c.numberEdit == id {
 		return nil, nil
 	}
 
@@ -209,60 +205,52 @@ func (c *Context) numberFieldF(value *float64, step float64, digits int, id Widg
 	})
 }
 
-func (c *Context) numberTextField(value *int, id WidgetID) (EventHandler, error) {
-	if c.pointing.justPressed() && ebiten.IsKeyPressed(ebiten.KeyShift) &&
-		c.hover == id {
+func (c *Context) numberTextField(value *int, id WidgetID) error {
+	if c.pointing.justPressed() && ebiten.IsKeyPressed(ebiten.KeyShift) && c.hover == id {
 		c.numberEdit = id
 		c.numberEditBuf = fmt.Sprintf("%d", *value)
 	}
 	if c.numberEdit == id {
 		e, err := c.textFieldRaw(&c.numberEditBuf, id, 0)
 		if err != nil {
-			return nil, err
+			return err
 		}
-		return &preprendedEventHandler{
-			e: e,
-			f: func() {
-				if e != nil || c.focus != id {
-					nval, err := strconv.ParseInt(c.numberEditBuf, 10, 64)
-					if err != nil {
-						nval = 0
-					}
-					*value = int(nval)
-					c.numberEdit = emptyWidgetID
+		if e != nil {
+			e.On(func() {
+				nval, err := strconv.ParseInt(c.numberEditBuf, 10, 64)
+				if err != nil {
+					nval = 0
 				}
-			},
-		}, nil
+				*value = int(nval)
+				c.numberEdit = emptyWidgetID
+			})
+		}
 	}
-	return nil, nil
+	return nil
 }
 
-func (c *Context) numberTextFieldF(value *float64, id WidgetID) (EventHandler, error) {
-	if c.pointing.justPressed() && ebiten.IsKeyPressed(ebiten.KeyShift) &&
-		c.hover == id {
+func (c *Context) numberTextFieldF(value *float64, id WidgetID) error {
+	if c.pointing.justPressed() && ebiten.IsKeyPressed(ebiten.KeyShift) && c.hover == id {
 		c.numberEdit = id
 		c.numberEditBuf = fmt.Sprintf(realFmt, *value)
 	}
 	if c.numberEdit == id {
 		e, err := c.textFieldRaw(&c.numberEditBuf, id, 0)
 		if err != nil {
-			return nil, err
+			return err
 		}
-		return &preprendedEventHandler{
-			e: e,
-			f: func() {
-				if e != nil || c.focus != id {
-					nval, err := strconv.ParseFloat(c.numberEditBuf, 64)
-					if err != nil {
-						nval = 0
-					}
-					*value = float64(nval)
-					c.numberEdit = emptyWidgetID
+		if e != nil {
+			e.On(func() {
+				nval, err := strconv.ParseFloat(c.numberEditBuf, 64)
+				if err != nil {
+					nval = 0
 				}
-			},
-		}, nil
+				*value = float64(nval)
+				c.numberEdit = emptyWidgetID
+			})
+		}
 	}
-	return nil, nil
+	return nil
 }
 
 func formatNumber(v float64, digits int) string {