summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--action.go10
-rw-r--r--add.go2
-rw-r--r--addText.go2
-rw-r--r--checkbox.go2
-rw-r--r--flags.go4
-rw-r--r--init.go26
-rw-r--r--place.go7
-rw-r--r--setText.go2
8 files changed, 31 insertions, 24 deletions
diff --git a/action.go b/action.go
index aa3c4d2..0515ef5 100644
--- a/action.go
+++ b/action.go
@@ -103,15 +103,7 @@ func show(n *tree.Node, b bool) {
}
}
-func enableWidget(n *tree.Node) {
- enable(n, true)
-}
-
-func disableWidget(n *tree.Node) {
- enable(n, false)
-}
-
-func enable(n *tree.Node, b bool) {
+func realEnable(n *tree.Node, b bool) {
if !ready(n) {
return
}
diff --git a/add.go b/add.go
index 02c69f6..0544f0f 100644
--- a/add.go
+++ b/add.go
@@ -69,7 +69,7 @@ func newAdd(n *tree.Node) {
if n.State.Enable {
// nothing to do
} else {
- enable(n, false)
+ realEnable(n, false)
}
}
}
diff --git a/addText.go b/addText.go
index 4759092..43e942f 100644
--- a/addText.go
+++ b/addText.go
@@ -6,7 +6,7 @@ import (
"go.wit.com/widget"
)
-func addText(n *tree.Node, s string) {
+func realAddText(n *tree.Node, s string) {
var tk *guiWidget
tk = n.TK.(*guiWidget)
log.Log(ANDLABS, "addText() START with s =", s)
diff --git a/checkbox.go b/checkbox.go
index f85c0d6..0789eb6 100644
--- a/checkbox.go
+++ b/checkbox.go
@@ -34,7 +34,7 @@ func (t *guiWidget) checked() bool {
return t.uiCheckbox.Checked()
}
-func setChecked(n *tree.Node, b bool) {
+func realSetChecked(n *tree.Node, b bool) {
if n.WidgetType != widget.Checkbox {
}
var tk *guiWidget
diff --git a/flags.go b/flags.go
index 93219c8..f2cb6ab 100644
--- a/flags.go
+++ b/flags.go
@@ -21,9 +21,9 @@ func init() {
short := "andlabs"
NOW = log.NewFlag("NOW", true, full, short, "temp debugging stuff")
- INFO = log.NewFlag("INFO", false, full, short, "normal debugging stuff")
+ INFO = log.NewFlag("INFO", true, full, short, "normal debugging stuff")
- WARN = log.NewFlag("WARN", false, full, short, "bad things")
+ WARN = log.NewFlag("WARN", true, full, short, "bad things")
full = "go.wit.com/gui"
short = "andlabs"
diff --git a/init.go b/init.go
index df62633..68c2f3c 100644
--- a/init.go
+++ b/init.go
@@ -37,6 +37,18 @@ func queueAdd(n *tree.Node) {
})
}
+func enableWidget(n *tree.Node) {
+ ui.QueueMain(func() {
+ realEnable(n, true)
+ })
+}
+
+func disableWidget(n *tree.Node) {
+ ui.QueueMain(func() {
+ realEnable(n, false)
+ })
+}
+
func setTitle(n *tree.Node, s string) {
ui.QueueMain(func() {
SetText(n, s)
@@ -45,25 +57,25 @@ func setTitle(n *tree.Node, s string) {
func setLabel(n *tree.Node, s string) {
ui.QueueMain(func() {
- SetText(n, s)
+ realSetText(n, s)
})
}
-func realSetText(n *tree.Node, s string) {
+func setText(n *tree.Node, s string) {
ui.QueueMain(func() {
- SetText(n, s)
+ realSetText(n, s)
})
}
-func realAddText(n *tree.Node, s string) {
+func addText(n *tree.Node, s string) {
ui.QueueMain(func() {
- AddText(n, s)
+ realAddText(n, s)
})
}
-func realSetChecked(n *tree.Node, b bool) {
+func setChecked(n *tree.Node, b bool) {
ui.QueueMain(func() {
- setChecked(n, b)
+ realSetChecked(n, b)
})
}
diff --git a/place.go b/place.go
index 2e92c95..b540c94 100644
--- a/place.go
+++ b/place.go
@@ -2,6 +2,7 @@ package main
import (
// "os"
+
"go.wit.com/dev/andlabs/ui"
_ "go.wit.com/dev/andlabs/ui/winmanifest"
@@ -61,13 +62,15 @@ func place(p *tree.Node, n *tree.Node) bool {
log.Sleep(1)
panic("ptk == nil")
}
+ p.DumpWidget("parent: ")
+ n.DumpWidget("child: ")
- log.Log(INFO, "place() switch", p.WidgetType, n.WidgetId, n.GetProgName())
+ log.Log(WARN, "place() switch", p.WidgetType, n.WidgetId, n.GetProgName())
switch p.WidgetType {
case widget.Grid:
tk.gridX = n.State.GridOffset.X - 1
tk.gridY = n.State.GridOffset.Y - 1
- log.Log(INFO, "place() on Grid at gridX,gridY", tk.gridX, tk.gridY)
+ log.Log(WARN, "place() on Grid at gridX,gridY", tk.gridX, tk.gridY)
ptk.uiGrid.Append(tk.uiControl,
tk.gridX, tk.gridY, 1, 1,
false, ui.AlignFill, false, ui.AlignFill)
diff --git a/setText.go b/setText.go
index 2724b62..71bde54 100644
--- a/setText.go
+++ b/setText.go
@@ -6,7 +6,7 @@ import (
"go.wit.com/widget"
)
-func setText(n *tree.Node, name string) {
+func realSetText(n *tree.Node, name string) {
// name := widget.GetString(a.Value)
var tk *guiWidget
tk = n.TK.(*guiWidget)