From 761250d24cae39dc246f940383697a3819323c0f Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Tue, 9 May 2023 18:53:31 -0500 Subject: [PATCH] more sendAction() cleanups Signed-off-by: Jeff Carr --- box.go | 2 +- button.go | 2 +- checkbox.go | 3 +-- dropdown.go | 4 ++-- grid.go | 2 +- group.go | 2 +- image.go | 2 +- label.go | 2 +- plugin.go | 4 +--- slider.go | 2 +- spinner.go | 7 ++----- tab.go | 2 +- textbox.go | 2 +- window.go | 2 +- 14 files changed, 16 insertions(+), 22 deletions(-) diff --git a/box.go b/box.go index 9148d83..a864e80 100644 --- a/box.go +++ b/box.go @@ -9,6 +9,6 @@ func (parent *Node) NewBox(name string, b bool) *Node { newNode.B = b a := newAction(newNode, toolkit.Add) - sendAction(a, newNode, parent) + sendAction(a) return newNode } diff --git a/button.go b/button.go index 6fd8521..6204efe 100644 --- a/button.go +++ b/button.go @@ -6,7 +6,7 @@ func (parent *Node) NewButton(name string, custom func()) *Node { newNode := parent.newNode(name, toolkit.Button, custom) a := newAction(newNode, toolkit.Add) - sendAction(a, newNode, parent) + sendAction(a) return newNode } diff --git a/checkbox.go b/checkbox.go index cf4c1a3..502acb4 100644 --- a/checkbox.go +++ b/checkbox.go @@ -10,7 +10,6 @@ func (n *Node) NewCheckbox(name string) *Node { newNode := n.newNode(name, toolkit.Checkbox, nil) a := newAction(newNode, toolkit.Add) - sendAction(a, newNode, n) - + sendAction(a) return newNode } diff --git a/dropdown.go b/dropdown.go index 102cb9c..ce49db6 100644 --- a/dropdown.go +++ b/dropdown.go @@ -23,7 +23,7 @@ func (n *Node) NewDropdown(name string) *Node { newNode := n.newNode(name, toolkit.Dropdown, nil) a := newAction(newNode, toolkit.Add) - sendAction(a, newNode, n) + sendAction(a) return newNode } @@ -32,7 +32,7 @@ func (n *Node) NewCombobox(name string) *Node { newNode := n.newNode(name, toolkit.Combobox, nil) a := newAction(newNode, toolkit.Add) - sendAction(a, newNode, n) + sendAction(a) return newNode } diff --git a/grid.go b/grid.go index 67a2924..103b8f7 100644 --- a/grid.go +++ b/grid.go @@ -36,7 +36,7 @@ func (n *Node) NewGrid(name string, w int, h int) *Node { newNode.NextW = 1 newNode.NextH = 1 - sendAction(a, newNode, n) + sendAction(a) return newNode } diff --git a/group.go b/group.go index aadc883..2c1974d 100644 --- a/group.go +++ b/group.go @@ -12,7 +12,7 @@ func (parent *Node) NewGroup(name string) *Node { newNode = parent.newNode(name, toolkit.Group, nil) a := newAction(newNode, toolkit.Add) - sendAction(a, newNode, parent) + sendAction(a) newBox := newNode.NewBox("defaultGroupBox", false) return newBox diff --git a/image.go b/image.go index 4531f23..16f7e9b 100644 --- a/image.go +++ b/image.go @@ -9,6 +9,6 @@ func (parent *Node) NewImage(name string) *Node { newNode = parent.newNode(name, toolkit.Image, nil) a := newAction(newNode, toolkit.Add) - sendAction(a, newNode, parent) + sendAction(a) return newNode } diff --git a/label.go b/label.go index 43f8073..3adab5b 100644 --- a/label.go +++ b/label.go @@ -7,6 +7,6 @@ import ( func (parent *Node) NewLabel(text string) *Node { newNode := parent.newNode(text, toolkit.Label, nil) a := newAction(newNode, toolkit.Add) - sendAction(a, newNode, parent) + sendAction(a) return newNode } diff --git a/plugin.go b/plugin.go index 1b9b290..207cd4b 100644 --- a/plugin.go +++ b/plugin.go @@ -222,9 +222,7 @@ func newAction(n *Node, atype toolkit.ActionType) *toolkit.Action { return &a } -// func sendAction(a *toolkit.Action) { -func sendAction(a *toolkit.Action, n *Node, where *Node) { - // newaction(a, n, where) +func sendAction(a *toolkit.Action) { for _, aplug := range allPlugins { log(debugPlugin, "Action() aplug =", aplug.name, "Action type=", a.ActionType) if (aplug.pluginChan == nil) { diff --git a/slider.go b/slider.go index cd59726..3f18b35 100644 --- a/slider.go +++ b/slider.go @@ -14,7 +14,7 @@ func (parent *Node) NewSlider(name string, x int, y int) *Node { a := newAction(newNode, toolkit.Add) a.X = x a.Y = y - sendAction(a, newNode, parent) + sendAction(a) return newNode } diff --git a/spinner.go b/spinner.go index 479dc62..bfbf5bf 100644 --- a/spinner.go +++ b/spinner.go @@ -11,11 +11,8 @@ func (parent *Node) NewSpinner(name string, x int, y int) *Node { newNode.X = x newNode.Y = y + a := newAction(newNode, toolkit.Add) - a.X = x - a.Y = y - sendAction(a, newNode, parent) - - + sendAction(a) return newNode } diff --git a/tab.go b/tab.go index 10c2e08..82f6289 100644 --- a/tab.go +++ b/tab.go @@ -31,7 +31,7 @@ func (n *Node) NewTab(text string) *Node { newNode := n.newNode(text, toolkit.Tab, nil) a := newAction(newNode, toolkit.Add) - sendAction(a, newNode, n) + sendAction(a) // by default, create a box inside the tab // TODO: allow this to be configurable diff --git a/textbox.go b/textbox.go index 61c9a5d..5877b32 100644 --- a/textbox.go +++ b/textbox.go @@ -10,6 +10,6 @@ func (parent *Node) NewTextbox(name string) *Node { }) a := newAction(newNode, toolkit.Add) - sendAction(a, newNode, parent) + sendAction(a) return newNode } diff --git a/window.go b/window.go index 09265d1..2e3187e 100644 --- a/window.go +++ b/window.go @@ -15,6 +15,6 @@ func (parent *Node) NewWindow(title string) *Node { log(logInfo, "NewWindow()", title) a := newAction(newNode, toolkit.Add) - sendAction(a, newNode, parent) + sendAction(a) return newNode }