From 20f13a4b5be1a986e1085214f492a0afe6db322f Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sun, 12 Mar 2023 08:47:16 -0500 Subject: Squashed commit of the following: commit 448abc843e2241bab6c399f7a836dccba1defc18 Author: Jeff Carr Date: Sun Mar 12 08:35:28 2023 -0500 this should probably be a new release now Signed-off-by: Jeff Carr commit a4064f7a6c5ac67437768aa2bc67c75dafc91c4c Author: Jeff Carr Date: Sat Mar 11 03:18:23 2023 -0600 able to work on add 'Box' and play with 'Image' Signed-off-by: Jeff Carr commit 6e59573d85e82ecb005805f50711dddc2df50480 Author: Jeff Carr Date: Sat Mar 11 03:04:34 2023 -0600 rearrange widget debugging Signed-off-by: Jeff Carr commit e0570de75c6eb1b4f49e541d9ef5d83ae4434d3d Author: Jeff Carr Date: Sat Mar 11 02:29:20 2023 -0600 debugging is lots smarter Signed-off-by: Jeff Carr commit ece32a1e43d91cd197d0a8497ad2f034c46126e1 Author: Jeff Carr Date: Fri Mar 10 21:38:23 2023 -0600 first pass on a node delete Signed-off-by: Jeff Carr commit c91cb0eddb0f73f8dea9b21a16cd76c7e2c19a33 Author: Jeff Carr Date: Fri Mar 10 21:06:29 2023 -0600 can recreate window list Signed-off-by: Jeff Carr commit 470f9dc26aefd3626b319264fe151aa48d4d5377 Author: Jeff Carr Date: Fri Mar 10 12:07:34 2023 -0600 attempt to ressurect mouse in the console plugin Signed-off-by: Jeff Carr commit 747bb53e06dda458cc8cd77b665f4d9d07f5e925 Author: Jeff Carr Date: Fri Mar 10 10:47:14 2023 -0600 jesus. gocui actually builds and works again as a plugin it didn't take too much to change it Signed-off-by: Jeff Carr commit 9283c65c8e9b8d2630b251ad952b6b52caddb307 Author: Jeff Carr Date: Fri Mar 10 07:26:53 2023 -0600 show/hide/etc for window widgets Signed-off-by: Jeff Carr commit 5724cd7ffd8595ae049a7c9c21cb2f1a993c4b76 Author: Jeff Carr Date: Fri Mar 10 06:40:36 2023 -0600 compiles and runs Signed-off-by: Jeff Carr commit 44a5e69ce17cb506adfe24ca72cc86caa9ebcc70 Author: Jeff Carr Date: Fri Mar 10 05:57:15 2023 -0600 more debugging improvements Signed-off-by: Jeff Carr commit b86f145f0252e7545b2e7fa78e1d5960cacb7bad Author: Jeff Carr Date: Fri Mar 10 03:42:32 2023 -0600 set margin on tab's works Signed-off-by: Jeff Carr commit d2218c08cf44acd5f017a8faa1439ee6d2fd46d5 Author: Jeff Carr Date: Thu Mar 9 16:26:21 2023 -0600 ignore all *.so files Signed-off-by: Jeff Carr commit e21934fff3cfea30b04df01bf0714f6927aa78f4 Author: Jeff Carr Date: Thu Mar 9 16:25:15 2023 -0600 can't embed the toolkit/*.so files here Signed-off-by: Jeff Carr commit f1e6c5fc9c8ca36db3ad6109d64612b6850fa856 Author: Jeff Carr Date: Thu Mar 9 16:21:14 2023 -0600 andlabs group widget has Show() and Hide() Signed-off-by: Jeff Carr commit e8487504aa76ca99c4891b777585a428fda0ef62 Author: Jeff Carr Date: Thu Mar 9 16:07:56 2023 -0600 pass the node id into the plugin to use in channels Signed-off-by: Jeff Carr commit 3667940a77af4e3855facb9247771d595477302f Author: Jeff Carr Date: Thu Mar 9 14:20:21 2023 -0600 fix SetText() on Label Signed-off-by: Jeff Carr commit 311d6be66db84b63fb7124df64e2e9be0f0b76a4 Author: Jeff Carr Date: Thu Mar 9 14:06:46 2023 -0600 still compiles and runs Signed-off-by: Jeff Carr commit ee4e9b21ef59a97f902c6dae2a57ac7b3063fe3b Author: Jeff Carr Date: Thu Mar 9 11:02:34 2023 -0600 compiles Signed-off-by: Jeff Carr Signed-off-by: Jeff Carr --- toolkit/andlabs/append.go | 76 +++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 38 deletions(-) (limited to 'toolkit/andlabs/append.go') diff --git a/toolkit/andlabs/append.go b/toolkit/andlabs/append.go index 811ffbc..4578c94 100644 --- a/toolkit/andlabs/append.go +++ b/toolkit/andlabs/append.go @@ -7,41 +7,35 @@ import ( _ "github.com/andlabs/ui/winmanifest" ) -// make new Group here -func (t *andlabsT) doAppend(newt *andlabsT, c *ui.Control) { - - if (newt.tw != nil) { - if (newt.tw.Type == toolkit.Grid) { - log(true, "doAppend() going to attempt uiGrid") - // hack to add shit to a grid - button1 := ui.NewButton("a(0,2)") - newt.uiGrid.Append(button1, - 0, 2, 1, 1, - false, ui.AlignFill, false, ui.AlignFill) - button2 := ui.NewButton("a(1,2)") - newt.uiGrid.Append(button2, - 1, 2, 1, 1, - false, ui.AlignFill, false, ui.AlignFill) +// move all the append code here +func (t *andlabsT) doAppend(kind toolkit.WidgetType, newt *andlabsT, c *ui.Control) { + if (kind == toolkit.Grid) { + log(debugToolkit, "doAppend() attempt to append a ui.Control into a uiGrid") + // hack to add shit to a grid + button1 := ui.NewButton("a(0,2)") + newt.uiGrid.Append(button1, + 0, 2, 1, 1, + false, ui.AlignFill, false, ui.AlignFill) + button2 := ui.NewButton("a(1,2)") + newt.uiGrid.Append(button2, + 1, 2, 1, 1, + false, ui.AlignFill, false, ui.AlignFill) - if (t.uiBox != nil) { - log(true, "doAppend() on uiGrid to a uiBox") - if (newt.Name == "output") { - t.uiBox.Append(newt.uiGrid, true) - } else { + if (t.uiBox != nil) { + log(debugToolkit, "doAppend() on uiGrid to a uiBox") + if (newt.Name == "output") { + t.uiBox.Append(newt.uiGrid, true) + } else { t.uiBox.Append(newt.uiGrid, stretchy) - } - return } - log(true, "doAppend() on uiGrid failed") return } - } else { - log(true, "doAppend() newt.tw == nil ERROR on newt.Name =", newt.Name) + log(debugToolkit, "doAppend() on uiGrid failed") + return } - // hack to pass a group - if (c == nil) { - log(true, "attempting to doAppend() on a uiGroup") + if (kind == toolkit.Group) { + log(debugToolkit, "doAppend() attempt a uiGroup") if (t.uiBox != nil) { if (newt.Name == "output") { t.uiBox.Append(newt.uiGroup, true) @@ -52,20 +46,19 @@ func (t *andlabsT) doAppend(newt *andlabsT, c *ui.Control) { } if (t.uiWindow != nil) { - log(true, "This is a raw window without a box. probably make a box here and add the group to that") - t.Dump(true) - newt.Dump(true) + log(debugToolkit, "This is a raw window without a box. probably make a box here and add the group to that") + newt.Dump(debugToolkit) t.uiBox = ui.NewHorizontalBox() t.uiWindow.SetChild(t.uiBox) - log(true, "tried to make a box", t.uiBox) + log(debugToolkit, "tried to make a box", t.uiBox) if (newt.Name == "output") { - log(true, "tried to t.uiBox.Append(*c, true)") + log(debugToolkit, "tried to t.uiBox.Append(*c, true)") if (t.uiBox == nil) { - log(true, "tried to t.uiBox.Append(*c, true)") + log(debugToolkit, "tried to t.uiBox.Append(*c, true)") } t.uiBox.Append(newt.uiGroup, true) } else { - log(true, "tried to t.uiBox.Append(*c, stretchy)") + log(debugToolkit, "tried to t.uiBox.Append(*c, stretchy)") t.uiBox.Append(newt.uiGroup, stretchy) } return @@ -75,7 +68,13 @@ func (t *andlabsT) doAppend(newt *andlabsT, c *ui.Control) { log(debugError, "probably could just make a box here?") exit("internal wit/gui error") } - if (t.uiBox != nil) { + + if (kind == toolkit.Textbox) { + if (t.uiBox == nil) { + log(debugError, "NewTextbox() node.UiBox == nil. I can't add a range UI element without a place to put it") + log(debugError, "probably could just make a box here?") + exit("internal wit/gui error") + } // TODO: temporary hack to make the output textbox 'fullscreen' if (newt.Name == "output") { t.uiBox.Append(*c, true) @@ -84,11 +83,12 @@ func (t *andlabsT) doAppend(newt *andlabsT, c *ui.Control) { } return } + if (t.uiWindow != nil) { - log(true, "This is a raw window without a box. probably make a box here and add the group to that") + log(debugToolkit, "This is a raw window without a box. probably make a box here and add the group to that") t.uiBox = ui.NewHorizontalBox() t.uiWindow.SetChild(t.uiBox) - log(true, "tried to make a box") + log(debugToolkit, "tried to make a box") if (newt.Name == "output") { t.uiBox.Append(*c, true) } else { -- cgit v1.2.3