summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2024-01-27 09:55:16 -0600
committerJeff Carr <[email protected]>2024-01-27 09:55:16 -0600
commitad0b252feb1bd3e758150b326c778fe4636ffe49 (patch)
treec75b5c63e60781bbe3fa4a3e2a75915f685efcc4
parent904801c593617810085e6b445224f0dacc4117c7 (diff)
nocui worksv0.13.14
set enable state Signed-off-by: Jeff Carr <[email protected]>
-rw-r--r--action.go2
-rw-r--r--common.go10
-rw-r--r--go.mod4
-rw-r--r--go.sum8
-rw-r--r--plugin.go11
-rw-r--r--window.go4
6 files changed, 21 insertions, 18 deletions
diff --git a/action.go b/action.go
index 0eecda1..4272424 100644
--- a/action.go
+++ b/action.go
@@ -111,7 +111,7 @@ func sendAction(n *Node, atype widget.ActionType) {
a.State.Checked = n.checked
a.State.Visable = n.visable
// TODO: if visable == false here, return
- a.State.Hidden = n.hidden
+ a.State.Enable = n.enabled
a.State.Pad = n.pad
a.State.Expand = n.expand
a.State.Borderless = n.borderless
diff --git a/common.go b/common.go
index 500e64d..dc77989 100644
--- a/common.go
+++ b/common.go
@@ -45,10 +45,10 @@ func (n *Node) Hide() *Node {
if n.WidgetType == widget.Window {
log.Log(CHANGE, "Hide() on a window", n.progname)
- log.Log(CHANGE, "Hide() this needs to do TestDestroy() ?")
- n.Destroy()
+ log.Log(CHANGE, "Hide() this needs to do destroy() ?")
+ n.destroy()
n.hidden = true
- // n.visable = false
+ n.visable = false
n.changed = true
return nil
}
@@ -157,7 +157,7 @@ func (n *Node) Strings() []string {
return tmp
}
-func (n *Node) Destroy() {
+func (n *Node) destroy() {
if !n.Ready() {
return
}
@@ -165,7 +165,7 @@ func (n *Node) Destroy() {
n.enabled = false
n.changed = true
- log.Log(CHANGE, "Destroy()", n.WidgetType, n.id, n.GetProgName())
+ log.Log(CHANGE, "destroy()", n.WidgetType, n.id, n.GetProgName())
// inform the toolkits
sendAction(n, widget.Delete)
diff --git a/go.mod b/go.mod
index 6711e4d..0896a32 100644
--- a/go.mod
+++ b/go.mod
@@ -4,8 +4,8 @@ go 1.21.4
require (
go.wit.com/dev/alexflint/arg v1.4.5
- go.wit.com/log v0.5.6
- go.wit.com/widget v1.1.7
+ go.wit.com/log v0.13.0
+ go.wit.com/widget v1.1.8
)
require (
diff --git a/go.sum b/go.sum
index 115a904..739d547 100644
--- a/go.sum
+++ b/go.sum
@@ -4,7 +4,7 @@ go.wit.com/dev/alexflint/scalar v1.2.1 h1:loXOcbVnd+8YeJRLey+XXidecBiedMDO00zQ26
go.wit.com/dev/alexflint/scalar v1.2.1/go.mod h1:+rYsfxqdI2cwA8kJ7GCMwWbNJvfvWUurOCXLiwdTtSs=
go.wit.com/dev/davecgh/spew v1.1.4 h1:C9hj/rjlUpdK+E6aroyLjCbS5MFcyNUOuP1ICLWdNek=
go.wit.com/dev/davecgh/spew v1.1.4/go.mod h1:sihvWmnQ/09FWplnEmozt90CCVqBtGuPXM811tgfhFA=
-go.wit.com/log v0.5.6 h1:rDC3ju95zfEads4f1Zm+QMkqjZ39CsYAT/UmQQs7VP4=
-go.wit.com/log v0.5.6/go.mod h1:BaJBfHFqcJSJLXGQ9RHi3XVhPgsStxSMZRlaRxW4kAo=
-go.wit.com/widget v1.1.7 h1:Gy84I2bD8CMna7NcKBX4sRLR8do6x6mVYX0Ui43f3is=
-go.wit.com/widget v1.1.7/go.mod h1:I8tnD3x3ECbB/CRNnLCdC+uoyk7rK0AEkzK1bQYSqoQ=
+go.wit.com/log v0.13.0 h1:0vyW3mHwDww3wCsyGnmQuX2P4V7aBMoJgxCy0GfA20g=
+go.wit.com/log v0.13.0/go.mod h1:BaJBfHFqcJSJLXGQ9RHi3XVhPgsStxSMZRlaRxW4kAo=
+go.wit.com/widget v1.1.8 h1:5cHcmfgwCyHjf02Af/9UMrbLhBR7Z/LFAjPuCx4dx5A=
+go.wit.com/widget v1.1.8/go.mod h1:I8tnD3x3ECbB/CRNnLCdC+uoyk7rK0AEkzK1bQYSqoQ=
diff --git a/plugin.go b/plugin.go
index 15f9814..6fc4616 100644
--- a/plugin.go
+++ b/plugin.go
@@ -173,18 +173,19 @@ func searchPaths(name string) *aplug {
func initToolkit(name string, filename string) *aplug {
if _, err := os.Stat(filename); err != nil {
if os.IsNotExist(err) {
- log.Log(PLUG, "missing plugin", name, "as filename", filename)
+ log.Log(PLUG, "initToolkit() missing plugin", name, "as filename", filename)
return nil
}
}
- log.Log(PLUG, "Found plugin", name, "as filename", filename)
+ log.Log(PLUG, "initToolkit() Found plugin", name, "as filename", filename)
+ log.Verbose("initToolkit() Verbose Found plugin", name, "as filename", filename)
plug, err := plugin.Open(filename)
if err != nil {
- log.Error(err, "plugin FAILED =", filename)
+ log.Error(err, "initToolkit() plugin FAILED =", filename)
return nil
}
- log.Log(PLUG, "initToolkit() loading plugin =", filename)
+ log.Log(PLUG, "initToolkit() SUCCESS loading plugin =", filename)
var newPlug *aplug
newPlug = new(aplug)
@@ -246,7 +247,7 @@ func (n *Node) LoadToolkitEmbed(name string, b []byte) *Node {
func (n *Node) ListToolkits() {
for _, aplug := range allPlugins {
- log.Log(PLUG, "ListToolkits() already loaded toolkit plugin =", aplug.name)
+ log.Info("ListToolkits() already loaded toolkit plugin =", aplug.name)
}
}
diff --git a/window.go b/window.go
index baa4751..de507a4 100644
--- a/window.go
+++ b/window.go
@@ -40,6 +40,7 @@ func (parent *Node) RawWindow(title string) *Node {
return newNode
}
+/*
// TODO: should do this recursively
func (n *Node) UnDraw() *Node {
if !n.Ready() {
@@ -53,8 +54,9 @@ func (n *Node) UnDraw() *Node {
sendAction(n, widget.Delete)
return n
}
+*/
-// TODO: should do this recursively
+// TODO: should do this recursively (on a window only)
func (n *Node) Draw() *Node {
if !n.Ready() {
return n