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/button.go | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) (limited to 'toolkit/andlabs/button.go') diff --git a/toolkit/andlabs/button.go b/toolkit/andlabs/button.go index deb34fa..4ae791c 100644 --- a/toolkit/andlabs/button.go +++ b/toolkit/andlabs/button.go @@ -10,11 +10,11 @@ import ( func newButton(parentW *toolkit.Widget, w *toolkit.Widget) { var t, newt *andlabsT var b *ui.Button - log(debugToolkit, "gui.andlabs.NewButton()", w.Name) + log(debugToolkit, "newButton()", w.Name) t = mapToolkits[parentW] if (t == nil) { - log(debugToolkit, "go.andlabs.NewButton() toolkit struct == nil. name=", parentW.Name, w.Name) + log(debugToolkit, "newButton() toolkit struct == nil. name=", parentW.Name, w.Name) return } @@ -32,22 +32,32 @@ func newButton(parentW *toolkit.Widget, w *toolkit.Widget) { newt.commonChange(newt.tw) }) - log(debugToolkit, "gui.Toolbox.NewButton() about to append to Box parent t:", w.Name) - log(debugToolkit, "gui.Toolbox.NewButton() about to append to Box new t:", w.Name) + log(debugToolkit, "newButton() about to append to Box parent t:", w.Name) + log(debugToolkit, "newButton() about to append to Box new t:", w.Name) + if (debugToolkit) { + ShowDebug () + } if (t.uiBox != nil) { t.uiBox.Append(b, stretchy) } else if (t.uiWindow != nil) { t.uiWindow.SetChild(b) } else { - log(debugToolkit, "ERROR: wit/gui andlabs couldn't place this button in a box or a window") - log(debugToolkit, "ERROR: wit/gui andlabs couldn't place this button in a box or a window") + log(debugError, "ERROR: wit/gui andlabs couldn't place this button in a box or a window") + log(debugError, "ERROR: wit/gui andlabs couldn't place this button in a box or a window") return } mapWidgetsToolkits(w, newt) } +// This routine is very specific to this toolkit +// It's annoying and has to be copied to each widget when there are changes +// it could be 'simplfied' maybe or made to be more generic, but this is as far as I've gotten +// it's probably not worth working much more on this toolkit, the andlabs/ui has been great and got me here! +// but it's time to write direct GTK, QT, macos and windows toolkit plugins +// -- jcarr 2023/03/09 + func doButton(p *toolkit.Widget, c *toolkit.Widget) { if broken(c) { return @@ -58,18 +68,18 @@ func doButton(p *toolkit.Widget, c *toolkit.Widget) { } ct := mapToolkits[c] if (ct == nil) { - log(true, "Trying to do something on a widget that doesn't work or doesn't exist or something", c) + log(debugError, "Trying to do something on a widget that doesn't work or doesn't exist or something", c) return } if ct.broken() { - log(true, "Button() ct.broken", ct) + log(debugError, "Button() ct.broken", ct) return } if (ct.uiButton == nil) { - log(true, "Button() uiButton == nil", ct) + log(debugError, "Button() uiButton == nil", ct) return } - log(true, "Going to attempt:", c.Action) + log(debugToolkit, "Going to attempt:", c.Action) switch c.Action { case "Enable": ct.uiButton.Enable() @@ -82,6 +92,6 @@ func doButton(p *toolkit.Widget, c *toolkit.Widget) { case "Set": ct.uiButton.SetText(c.S) default: - log(true, "Can't do", c.Action, "to a Button") + log(debugError, "Can't do", c.Action, "to a Button") } } -- cgit v1.2.3