Compare commits
4 Commits
Author | SHA1 | Date |
---|---|---|
|
391ed60415 | |
|
7af0ecf8f1 | |
|
844668dabd | |
|
ebeeed84b4 |
14
Makefile
14
Makefile
|
@ -28,20 +28,6 @@ update:
|
|||
git pull
|
||||
go get -v -t -u ./...
|
||||
|
||||
# sync repo to the github backup
|
||||
# git remote add github git@github.com:wit-go/gui.git
|
||||
github:
|
||||
git push origin master
|
||||
git push origin devel
|
||||
git push origin --tags
|
||||
git push github master
|
||||
git push github devel
|
||||
git push github --tags
|
||||
@echo
|
||||
@echo check https://git.wit.org/gui/gui
|
||||
@echo check https://github.com/wit-go/gui
|
||||
@echo
|
||||
|
||||
doc:
|
||||
godoc -v
|
||||
|
||||
|
|
|
@ -36,8 +36,6 @@ func sendAction(n *Node, atype widget.ActionType) {
|
|||
a.Strings = n.strings
|
||||
|
||||
// These should be improved/deprecated based on the gui/widget docs
|
||||
a.Expand = n.expand
|
||||
|
||||
a.X = n.X
|
||||
a.Y = n.Y
|
||||
|
||||
|
|
2
args.go
2
args.go
|
@ -2,7 +2,7 @@ package gui
|
|||
|
||||
import (
|
||||
"go.wit.com/log"
|
||||
"go.wit.com/dev/alexflint/go-arg"
|
||||
"go.wit.com/dev/alexflint/arg"
|
||||
)
|
||||
|
||||
var INFO *log.LogFlag
|
||||
|
|
40
common.go
40
common.go
|
@ -17,6 +17,13 @@ func (n *Node) Show() *Node {
|
|||
n.hidden = false
|
||||
n.changed = true
|
||||
|
||||
if n.WidgetType == widget.Window {
|
||||
log.Warn("Show on a hidden window", n.progname)
|
||||
log.Warn("this needs to do TestDraw()")
|
||||
n.TestDraw()
|
||||
return n
|
||||
}
|
||||
|
||||
// inform the toolkits
|
||||
sendAction(n, widget.Show)
|
||||
return n
|
||||
|
@ -26,8 +33,19 @@ func (n *Node) Hide() *Node {
|
|||
if ! n.Ready() { return n }
|
||||
if n.Hidden() { return n }
|
||||
|
||||
|
||||
if n.WidgetType == widget.Window {
|
||||
log.Warn("Hide on a window", n.progname)
|
||||
log.Warn("this needs to do TestDestroy() ?")
|
||||
n.Destroy()
|
||||
n.hidden = true
|
||||
n.changed = true
|
||||
return nil
|
||||
}
|
||||
|
||||
n.hidden = true
|
||||
n.changed = true
|
||||
|
||||
// inform the toolkits
|
||||
sendAction(n, widget.Hide)
|
||||
return n
|
||||
|
@ -61,6 +79,18 @@ func (n *Node) Disable() *Node {
|
|||
return n
|
||||
}
|
||||
|
||||
func (n *Node) Destroy() {
|
||||
if ! n.Ready() { return }
|
||||
// if ! n.enabled { return }
|
||||
|
||||
n.enabled = false
|
||||
n.changed = true
|
||||
|
||||
// inform the toolkits
|
||||
sendAction(n, widget.Delete)
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
// add a new text string to widgets that support
|
||||
// multiple string values
|
||||
|
@ -116,17 +146,17 @@ func (n *Node) GetBool() bool {
|
|||
}
|
||||
|
||||
// should get the reference name used for programming and debugging
|
||||
func (n *Node) SetProgName(s string) {
|
||||
if ! n.Ready() { return }
|
||||
func (n *Node) SetProgName(s string) *Node {
|
||||
if ! n.Ready() { return n }
|
||||
|
||||
if n.progname == s {
|
||||
// don't do anything since nothing changed
|
||||
return
|
||||
return n
|
||||
}
|
||||
|
||||
n.changed = true
|
||||
n.progname = s
|
||||
return
|
||||
return n
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -160,6 +190,7 @@ func (n *Node) Margin() *Node {
|
|||
n.margin = true
|
||||
n.changed = true
|
||||
|
||||
log.Warn("Margin()", n.WidgetType, n.progname)
|
||||
// inform the toolkits
|
||||
sendAction(n, widget.Margin)
|
||||
return n
|
||||
|
@ -184,6 +215,7 @@ func (n *Node) Pad() *Node {
|
|||
n.pad = true
|
||||
n.changed = true
|
||||
|
||||
log.Warn("Pad()", n.WidgetType, n.progname)
|
||||
// inform the toolkits
|
||||
sendAction(n, widget.Pad)
|
||||
return n
|
||||
|
|
10
go.mod
10
go.mod
|
@ -3,12 +3,12 @@ module go.wit.com/gui/gui
|
|||
go 1.21.4
|
||||
|
||||
require (
|
||||
github.com/alexflint/go-arg v1.4.3
|
||||
go.wit.com/gui/widget v0.0.0-20240105185907-84aafa536a93
|
||||
go.wit.com/log v0.3.1
|
||||
go.wit.com/dev/alexflint/arg v1.4.5
|
||||
go.wit.com/gui/widget v1.1.3
|
||||
go.wit.com/log v0.5.4
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/alexflint/go-scalar v1.1.0 // indirect
|
||||
go.wit.com/spew v0.0.0-20240101141411-c7b8e91573c9 // indirect
|
||||
go.wit.com/dev/alexflint/scalar v1.2.1 // indirect
|
||||
go.wit.com/dev/davecgh/spew v1.1.4 // indirect
|
||||
)
|
||||
|
|
32
go.sum
32
go.sum
|
@ -1,22 +1,10 @@
|
|||
github.com/alexflint/go-arg v1.4.3 h1:9rwwEBpMXfKQKceuZfYcwuc/7YY7tWJbFsgG5cAU/uo=
|
||||
github.com/alexflint/go-arg v1.4.3/go.mod h1:3PZ/wp/8HuqRZMUUgu7I+e1qcpUbvmS258mRXkFH4IA=
|
||||
github.com/alexflint/go-scalar v1.1.0 h1:aaAouLLzI9TChcPXotr6gUhq+Scr8rl0P9P4PnltbhM=
|
||||
github.com/alexflint/go-scalar v1.1.0/go.mod h1:LoFvNMqS1CPrMVltza4LvnGKhaSpc3oyLEBUZVhhS2o=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
||||
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
|
||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
go.wit.com/gui/widget v0.0.0-20240105185907-84aafa536a93 h1:zCzaHvXJJ/rWXmDc/v79VvM6W2lxxzJGfnW2lHCv3Ho=
|
||||
go.wit.com/gui/widget v0.0.0-20240105185907-84aafa536a93/go.mod h1:A6/FaiFQtAHTjgo7c4FrokXe6bXX1Cowo35b2Lgi31E=
|
||||
go.wit.com/log v0.3.1 h1:UXtgJ4dwyWL0Yv4mw6gQnlmrIQU/zz6nClCB7NGKBQs=
|
||||
go.wit.com/log v0.3.1/go.mod h1:GmsggfsKrqdZdAj26fEOlcTz6qEIazbV33uyuuktvB8=
|
||||
go.wit.com/spew v0.0.0-20240101141411-c7b8e91573c9 h1:UEX2EzLQPzLTfy/kUFQD7OXtvKn8wk/+jpDOkbl4ff4=
|
||||
go.wit.com/spew v0.0.0-20240101141411-c7b8e91573c9/go.mod h1:qBpgJXThMMT15vym7/E4Ur9y8oOo2nP7t2RP52QHUNw=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
go.wit.com/dev/alexflint/arg v1.4.5 h1:asDx5f9IlfpknKjPBqqb2qndE91Pbo7ZDkWUgddfMhY=
|
||||
go.wit.com/dev/alexflint/arg v1.4.5/go.mod h1:wnWc+c6z8kSdDKYriMf6RpM+FiXmo5RYp/t4FNi0MU0=
|
||||
go.wit.com/dev/alexflint/scalar v1.2.1 h1:loXOcbVnd+8YeJRLey+XXidecBiedMDO00zQ26TvKNs=
|
||||
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/gui/widget v1.1.3 h1:GvLzGSOF9tfmoh6HNbFdN+NSlBo2qeS/Ba2TnQQ1A1U=
|
||||
go.wit.com/gui/widget v1.1.3/go.mod h1:A6/FaiFQtAHTjgo7c4FrokXe6bXX1Cowo35b2Lgi31E=
|
||||
go.wit.com/log v0.5.4 h1:vijLRPTUgChb8J5tx/7Uma/lGTUxeSXosFbheAmL914=
|
||||
go.wit.com/log v0.5.4/go.mod h1:BaJBfHFqcJSJLXGQ9RHi3XVhPgsStxSMZRlaRxW4kAo=
|
||||
|
|
|
@ -201,7 +201,6 @@ func initToolkit(name string, filename string) *aplug {
|
|||
// add it to the list of plugins
|
||||
allPlugins = append(allPlugins, newPlug)
|
||||
|
||||
|
||||
// set the communication to the plugins
|
||||
newPlug.pluginChan = newPlug.PluginChannel()
|
||||
if (newPlug.pluginChan == nil) {
|
||||
|
|
|
@ -0,0 +1,14 @@
|
|||
package gui
|
||||
|
||||
import (
|
||||
"go.wit.com/gui/widget"
|
||||
)
|
||||
|
||||
func (parent *Node) NewSeparator(progname string) *Node {
|
||||
newNode := parent.newNode(progname, widget.Separator)
|
||||
newNode.progname = progname
|
||||
|
||||
// inform the toolkits
|
||||
sendAction(newNode, widget.Add)
|
||||
return newNode
|
||||
}
|
Loading…
Reference in New Issue