summaryrefslogtreecommitdiff
path: root/toolkit/andlabs
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit/andlabs')
-rw-r--r--toolkit/andlabs/action.go8
-rw-r--r--toolkit/andlabs/add.go4
-rw-r--r--toolkit/andlabs/box.go2
-rw-r--r--toolkit/andlabs/button.go2
-rw-r--r--toolkit/andlabs/checkbox.go4
-rw-r--r--toolkit/andlabs/combobox.go4
l---------[-rw-r--r--]toolkit/andlabs/common.go85
-rw-r--r--toolkit/andlabs/debug.go2
-rw-r--r--toolkit/andlabs/demo.go2
-rw-r--r--toolkit/andlabs/dropdown.go6
-rw-r--r--toolkit/andlabs/grid.go4
-rw-r--r--toolkit/andlabs/group.go2
-rw-r--r--toolkit/andlabs/image.go2
-rw-r--r--toolkit/andlabs/label.go2
-rw-r--r--toolkit/andlabs/main.go2
-rw-r--r--toolkit/andlabs/slider.go2
-rw-r--r--toolkit/andlabs/spinner.go2
-rw-r--r--toolkit/andlabs/structs.go19
-rw-r--r--toolkit/andlabs/tab.go17
-rw-r--r--toolkit/andlabs/textbox.go2
-rw-r--r--toolkit/andlabs/widget.go29
-rw-r--r--toolkit/andlabs/window.go8
22 files changed, 84 insertions, 126 deletions
diff --git a/toolkit/andlabs/action.go b/toolkit/andlabs/action.go
index 16a895b..2088917 100644
--- a/toolkit/andlabs/action.go
+++ b/toolkit/andlabs/action.go
@@ -195,7 +195,7 @@ func rawAction(a toolkit.Action) {
return
}
- n := rootNode.findWidgetId(a.WidgetId)
+ n := me.rootNode.findWidgetId(a.WidgetId)
if (a.ActionType == toolkit.Add) {
ui.QueueMain(func() {
@@ -208,12 +208,12 @@ func rawAction(a toolkit.Action) {
if (a.ActionType == toolkit.Dump) {
log(debugNow, "rawAction() Dump =", a.ActionType, a.WidgetType, n.Name)
- rootNode.listChildren(true)
+ me.rootNode.listChildren(true)
return
}
if (n == nil) {
- rootNode.listChildren(true)
+ me.rootNode.listChildren(true)
log(true, "rawAction() ERROR findWidgetId found nil", a.ActionType, a.WidgetType)
log(true, "rawAction() ERROR findWidgetId found nil for id =", a.WidgetId)
log(true, "rawAction() ERROR findWidgetId found nil", a.ActionType, a.WidgetType)
@@ -256,7 +256,7 @@ func rawAction(a toolkit.Action) {
n.Delete()
case toolkit.Move:
log(debugNow, "rawAction() attempt to move() =", a.ActionType, a.WidgetType)
- newParent := rootNode.findWidgetId(a.ParentId)
+ newParent := me.rootNode.findWidgetId(a.ParentId)
n.move(newParent)
default:
log(debugError, "rawAction() Unknown =", a.ActionType, a.WidgetType)
diff --git a/toolkit/andlabs/add.go b/toolkit/andlabs/add.go
index b01dd20..0d1ac32 100644
--- a/toolkit/andlabs/add.go
+++ b/toolkit/andlabs/add.go
@@ -17,10 +17,10 @@ func actionDump(b bool, a *toolkit.Action) {
func add(a toolkit.Action) {
if (a.WidgetType == toolkit.Root) {
- rootNode = addWidget(&a, nil)
+ me.rootNode = addWidget(&a)
return
}
- n := addWidget(&a, nil)
+ n := addWidget(&a)
p := n.parent
switch n.WidgetType {
diff --git a/toolkit/andlabs/box.go b/toolkit/andlabs/box.go
index 8698a74..e33b7a1 100644
--- a/toolkit/andlabs/box.go
+++ b/toolkit/andlabs/box.go
@@ -9,7 +9,7 @@ import (
func (p *node) newBox(n *node) {
log(debugToolkit, "newBox()", n.Name)
- newt := new(andlabsT)
+ newt := new(guiWidget)
var box *ui.Box
log(debugToolkit, "rawBox() create", n.Name)
diff --git a/toolkit/andlabs/button.go b/toolkit/andlabs/button.go
index d61c0ea..1dbad5c 100644
--- a/toolkit/andlabs/button.go
+++ b/toolkit/andlabs/button.go
@@ -14,7 +14,7 @@ func (p *node) newButton(n *node) {
return
}
- newt := new(andlabsT)
+ newt := new(guiWidget)
b := ui.NewButton(n.Text)
newt.uiButton = b
diff --git a/toolkit/andlabs/checkbox.go b/toolkit/andlabs/checkbox.go
index 4c690c1..4c37fd6 100644
--- a/toolkit/andlabs/checkbox.go
+++ b/toolkit/andlabs/checkbox.go
@@ -6,7 +6,7 @@ import (
)
func (p *node) newCheckbox(n *node) {
- newt := new(andlabsT)
+ newt := new(guiWidget)
log(debugToolkit, "newCheckbox()", n.Name, n.WidgetType)
newt.uiCheckbox = ui.NewCheckbox(n.Text)
@@ -22,6 +22,6 @@ func (p *node) newCheckbox(n *node) {
p.place(n)
}
-func (t *andlabsT) checked() bool {
+func (t *guiWidget) checked() bool {
return t.uiCheckbox.Checked()
}
diff --git a/toolkit/andlabs/combobox.go b/toolkit/andlabs/combobox.go
index 564ff23..283a29d 100644
--- a/toolkit/andlabs/combobox.go
+++ b/toolkit/andlabs/combobox.go
@@ -6,7 +6,7 @@ import (
)
func (p *node) newCombobox(n *node) {
- newt := new(andlabsT)
+ newt := new(guiWidget)
log(debugToolkit, "newCombobox() START", n.Name)
cb := ui.NewEditableCombobox()
@@ -26,7 +26,7 @@ func (p *node) newCombobox(n *node) {
p.place(n)
}
-func (t *andlabsT) AddComboboxName(title string) {
+func (t *guiWidget) AddComboboxName(title string) {
t.uiEditableCombobox.Append(title)
if (t.val == nil) {
log(debugToolkit, "make map didn't work")
diff --git a/toolkit/andlabs/common.go b/toolkit/andlabs/common.go
index ff157ab..35417a1 100644..120000
--- a/toolkit/andlabs/common.go
+++ b/toolkit/andlabs/common.go
@@ -1,84 +1 @@
-package main
-
-import (
- "git.wit.org/wit/gui/toolkit"
-)
-
-// searches the binary tree for a WidgetId
-func (n *node) findWidgetId(id int) *node {
- if (n == nil) {
- return nil
- }
-
- if n.WidgetId == id {
- return n
- }
-
- for _, child := range n.children {
- newN := child.findWidgetId(id)
- if (newN != nil) {
- return newN
- }
- }
- return nil
-}
-
-func addWidget(a *toolkit.Action, tk *andlabsT) *node {
- n := new(node)
- n.WidgetType = a.WidgetType
- n.WidgetId = a.WidgetId
- n.ParentId = a.ParentId
-
- // copy the data from the action message
- n.Name = a.Name
- n.Text = a.Text
- n.I = a.I
- n.S = a.S
- n.B = a.B
- n.X = a.X
- n.Y = a.Y
-
- n.W = a.W
- n.H = a.H
- n.AtW = a.AtW
- n.AtH = a.AtH
-
- // store the internal toolkit information
- n.tk = tk
-
- if (a.WidgetType == toolkit.Root) {
- log(logInfo, "addWidget() Root")
- return n
- }
-
- if (rootNode.findWidgetId(a.WidgetId) != nil) {
- log(logError, "addWidget() WidgetId already exists", a.WidgetId)
- return rootNode.findWidgetId(a.WidgetId)
- }
-
- // add this new widget on the binary tree
- n.parent = rootNode.findWidgetId(a.ParentId)
- if n.parent != nil {
- n.parent.children = append(n.parent.children, n)
- }
- return n
-}
-
-func (n *node) doUserEvent() {
- if (callback == nil) {
- log(debugError, "doUserEvent() callback == nil", n.WidgetId)
- return
- }
- var a toolkit.Action
- a.WidgetId = n.WidgetId
- a.Name = n.Name
- a.Text = n.Text
- a.S = n.S
- a.I = n.I
- a.B = n.B
- a.ActionType = toolkit.User
- log(logInfo, "doUserEvent() START: send a user event to the callback channel")
- callback <- a
- log(logInfo, "doUserEvent() END: sent a user event to the callback channel")
- return
-}
+../nocui/common.go \ No newline at end of file
diff --git a/toolkit/andlabs/debug.go b/toolkit/andlabs/debug.go
index 87e875d..33f8c44 100644
--- a/toolkit/andlabs/debug.go
+++ b/toolkit/andlabs/debug.go
@@ -49,7 +49,7 @@ func ShowDebug () {
log(true, "debugError =", debugError)
}
-func (t *andlabsT) Dump(b bool) {
+func (t *guiWidget) Dump(b bool) {
if ! b {
return
}
diff --git a/toolkit/andlabs/demo.go b/toolkit/andlabs/demo.go
index 1b9a2b1..c3cd418 100644
--- a/toolkit/andlabs/demo.go
+++ b/toolkit/andlabs/demo.go
@@ -17,7 +17,7 @@ func BlankWindow(w *ui.Window) *ui.Box {
return hbox
}
-func (t *andlabsT) DemoNumbersPage() {
+func (t *guiWidget) DemoNumbersPage() {
var w *ui.Window
log(debugToolkit, "Starting wit/gui toolkit andlabs/ui DemoNumbersPage()")
diff --git a/toolkit/andlabs/dropdown.go b/toolkit/andlabs/dropdown.go
index d98526a..e811a71 100644
--- a/toolkit/andlabs/dropdown.go
+++ b/toolkit/andlabs/dropdown.go
@@ -8,7 +8,7 @@ import (
)
func (p *node) newDropdown(n *node) {
- newt := new(andlabsT)
+ newt := new(guiWidget)
log(debugToolkit, "gui.Toolbox.newDropdown() START", n.Name)
cb := ui.NewCombobox()
@@ -34,7 +34,7 @@ func (p *node) newDropdown(n *node) {
p.place(n)
}
-func (t *andlabsT) addDropdownName(title string) {
+func (t *guiWidget) addDropdownName(title string) {
t.uiCombobox.Append(title)
if (t.val == nil) {
log(debugToolkit, "make map didn't work")
@@ -50,7 +50,7 @@ func (t *andlabsT) addDropdownName(title string) {
t.c = t.c + 1
}
-func (t *andlabsT) SetDropdown(i int) {
+func (t *guiWidget) SetDropdown(i int) {
t.uiCombobox.SetSelected(i)
}
diff --git a/toolkit/andlabs/grid.go b/toolkit/andlabs/grid.go
index 8764962..6c47d1b 100644
--- a/toolkit/andlabs/grid.go
+++ b/toolkit/andlabs/grid.go
@@ -11,10 +11,10 @@ import (
// -- (1,2) -- (2,1) -- (3,1) --
// -----------------------------
func (p *node) newGrid(n *node) {
- var newt *andlabsT
+ var newt *guiWidget
log(debugToolkit, "newGrid()", n.WidgetId, "to", n.ParentId)
- newt = new(andlabsT)
+ newt = new(guiWidget)
c := ui.NewGrid()
newt.uiGrid = c
diff --git a/toolkit/andlabs/group.go b/toolkit/andlabs/group.go
index 077aea0..b7c450e 100644
--- a/toolkit/andlabs/group.go
+++ b/toolkit/andlabs/group.go
@@ -8,7 +8,7 @@ import (
func (p *node) newGroup(n *node) {
log(debugToolkit, "NewGroup()", n.Name)
- newt := new(andlabsT)
+ newt := new(guiWidget)
log(debugToolkit, "NewGroup() create", n.Name)
diff --git a/toolkit/andlabs/image.go b/toolkit/andlabs/image.go
index a565376..bab1a9e 100644
--- a/toolkit/andlabs/image.go
+++ b/toolkit/andlabs/image.go
@@ -7,7 +7,7 @@ import (
// make new Image using andlabs/ui
func (p *node) newImage(n *node) {
- newt := new(andlabsT)
+ newt := new(guiWidget)
var img *ui.Image
log(debugToolkit, "rawImage() create", n.Name)
diff --git a/toolkit/andlabs/label.go b/toolkit/andlabs/label.go
index 0fa075e..3f06546 100644
--- a/toolkit/andlabs/label.go
+++ b/toolkit/andlabs/label.go
@@ -8,7 +8,7 @@ import (
func (p *node) newLabel(n *node) {
log(logInfo, "NewLabel()", n.Name)
- newt := new(andlabsT)
+ newt := new(guiWidget)
c := ui.NewLabel(n.Name)
newt.uiLabel = c
newt.uiControl = c
diff --git a/toolkit/andlabs/main.go b/toolkit/andlabs/main.go
index 3ba3079..4737337 100644
--- a/toolkit/andlabs/main.go
+++ b/toolkit/andlabs/main.go
@@ -13,7 +13,7 @@ import (
var pluginChan chan toolkit.Action
// the starting point of the binary tree
-var rootNode *node
+// var rootNode *node
var uiMainUndef bool = true
var uiMain sync.Once
diff --git a/toolkit/andlabs/slider.go b/toolkit/andlabs/slider.go
index f1b4676..5098943 100644
--- a/toolkit/andlabs/slider.go
+++ b/toolkit/andlabs/slider.go
@@ -6,7 +6,7 @@ import (
)
func (p *node) newSlider(n *node) {
- newt := new(andlabsT)
+ newt := new(guiWidget)
s := ui.NewSlider(n.X, n.Y)
newt.uiSlider = s
diff --git a/toolkit/andlabs/spinner.go b/toolkit/andlabs/spinner.go
index b7d5947..bab7a29 100644
--- a/toolkit/andlabs/spinner.go
+++ b/toolkit/andlabs/spinner.go
@@ -6,7 +6,7 @@ import (
)
func (p *node) newSpinner(n *node) {
- newt := new(andlabsT)
+ newt := new(guiWidget)
s := ui.NewSpinbox(n.X, n.Y)
newt.uiSpinbox = s
diff --git a/toolkit/andlabs/structs.go b/toolkit/andlabs/structs.go
index 507a50c..c5f94ee 100644
--- a/toolkit/andlabs/structs.go
+++ b/toolkit/andlabs/structs.go
@@ -1,14 +1,22 @@
package main
-import "git.wit.org/wit/gui/toolkit"
+// import "git.wit.org/wit/gui/toolkit"
import "github.com/andlabs/ui"
import _ "github.com/andlabs/ui/winmanifest"
// var andlabs map[int]*andlabsT
// var callback func(int) bool
-var callback chan toolkit.Action
+// var callback chan toolkit.Action
+// It's probably a terrible idea to call this 'me'
+var me config
+
+type config struct {
+ rootNode *node // the base of the binary tree. it should have id == 0
+}
+
+/*
type node struct {
parent *node
children []*node
@@ -41,15 +49,16 @@ type node struct {
// the internal plugin toolkit structure
tk *andlabsT
}
+*/
// stores the raw toolkit internals
-type andlabsT struct {
+type guiWidget struct {
Width int
Height int
// tw *toolkit.Widget
- parent *andlabsT
- children []*andlabsT
+ parent *guiWidget
+ children []*guiWidget
// used to track if a tab has a child widget yet
child bool
diff --git a/toolkit/andlabs/tab.go b/toolkit/andlabs/tab.go
index 2f44b03..aa851d1 100644
--- a/toolkit/andlabs/tab.go
+++ b/toolkit/andlabs/tab.go
@@ -20,8 +20,11 @@ import (
any existing tabs rather than adding a new one
*/
func (p *node) newTab(n *node) {
- var newt *andlabsT
+ var newt *guiWidget
+ if (p == nil) {
+ log(debugError, "newTab() p == nil. how the fuck does this happen?", n.WidgetId, n.ParentId)
+ }
if (p.WidgetType != toolkit.Window) {
log(debugError, "newTab() uiWindow == nil. I can't add a toolbar without window", n.WidgetId, n.ParentId)
return
@@ -40,8 +43,8 @@ func (p *node) newTab(n *node) {
log(debugToolkit, "newTab() GOOD. This should be an additional tab:", n.WidgetId, n.ParentId)
if (n.WidgetType == toolkit.Tab) {
// andlabs doesn't have multiple tab widgets so make a fake one?
- // this makes a andlabsT internal structure with the parent values
- newt = new(andlabsT)
+ // this makes a guiWidget internal structure with the parent values
+ newt = new(guiWidget)
newt.uiWindow = t.uiWindow
newt.uiTab = t.uiTab
} else {
@@ -63,8 +66,8 @@ func tabSetMargined(tab *ui.Tab, b bool) {
}
}
-func rawTab(w *ui.Window, name string) *andlabsT {
- var newt andlabsT
+func rawTab(w *ui.Window, name string) *guiWidget {
+ var newt guiWidget
log(debugToolkit, "rawTab() START", name)
if (w == nil) {
@@ -83,8 +86,8 @@ func rawTab(w *ui.Window, name string) *andlabsT {
return &newt
}
-func (t *andlabsT) appendTab(name string) *andlabsT {
- var newT andlabsT
+func (t *guiWidget) appendTab(name string) *guiWidget {
+ var newT guiWidget
log(debugToolkit, "appendTab() ADD", name)
if (t.uiTab == nil) {
diff --git a/toolkit/andlabs/textbox.go b/toolkit/andlabs/textbox.go
index 1745d11..7cb5d63 100644
--- a/toolkit/andlabs/textbox.go
+++ b/toolkit/andlabs/textbox.go
@@ -6,7 +6,7 @@ import (
)
func (p *node) newTextbox(n *node) {
- newt := new(andlabsT)
+ newt := new(guiWidget)
if (n.X == 1) {
e := ui.NewEntry()
diff --git a/toolkit/andlabs/widget.go b/toolkit/andlabs/widget.go
new file mode 100644
index 0000000..9155530
--- /dev/null
+++ b/toolkit/andlabs/widget.go
@@ -0,0 +1,29 @@
+package main
+
+import (
+ "git.wit.org/wit/gui/toolkit"
+)
+
+// this is specific to the nocui toolkit
+func initWidget(n *node) *guiWidget {
+ var w *guiWidget
+ w = new(guiWidget)
+ // Set(w, "default")
+
+ if n.WidgetType == toolkit.Root {
+ log(logInfo, "setupWidget() FOUND ROOT w.id =", n.WidgetId)
+ n.WidgetId = 0
+ me.rootNode = n
+ return w
+ }
+
+ if (n.WidgetType == toolkit.Box) {
+ if (n.B) {
+ n.horizontal = true
+ } else {
+ n.horizontal = false
+ }
+ }
+
+ return w
+}
diff --git a/toolkit/andlabs/window.go b/toolkit/andlabs/window.go
index ccc523a..f51536b 100644
--- a/toolkit/andlabs/window.go
+++ b/toolkit/andlabs/window.go
@@ -5,18 +5,18 @@ import (
_ "github.com/andlabs/ui/winmanifest"
)
-func (t *andlabsT) MessageWindow(msg1 string, msg2 string) {
+func (t *guiWidget) MessageWindow(msg1 string, msg2 string) {
ui.MsgBox(t.uiWindow, msg1, msg2)
}
-func (t *andlabsT) ErrorWindow(msg1 string, msg2 string) {
+func (t *guiWidget) ErrorWindow(msg1 string, msg2 string) {
ui.MsgBoxError(t.uiWindow, msg1, msg2)
}
func newWindow(n *node) {
- var newt *andlabsT
+ var newt *guiWidget
- newt = new(andlabsT)
+ newt = new(guiWidget)
// menubar bool is if the OS defined border on the window should be used
win := ui.NewWindow(n.Name, n.X, n.Y, menubar)
generated by cgit v1.2.3 (git 2.51.0) at 2025-11-27 19:29:13 +0000