summaryrefslogtreecommitdiff
path: root/cmds/gui-demo
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2022-10-17 22:39:03 -0500
committerJeff Carr <[email protected]>2022-10-17 22:39:03 -0500
commit15baefd9a7d145ddffced80d0fb6c14f258bdcc9 (patch)
tree633838faafa5c545635e77d441455bc8eb47958f /cmds/gui-demo
parent7e32b1fb9a44624ce2d4a8bc5c6acd5fafc820f3 (diff)
GROUP: implement 'group' in toolkit/
move gui.group into toolkit remove duplicate code update demo
Diffstat (limited to 'cmds/gui-demo')
-rw-r--r--cmds/gui-demo/demo-window.go33
-rw-r--r--cmds/gui-demo/main.go14
2 files changed, 1 insertions, 46 deletions
diff --git a/cmds/gui-demo/demo-window.go b/cmds/gui-demo/demo-window.go
deleted file mode 100644
index fd8e8f4..0000000
--- a/cmds/gui-demo/demo-window.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package main
-
-import "log"
-
-import "git.wit.org/wit/gui"
-
-func demoClick (n *gui.Node) {
- log.Println("demoClick() Dumping node:")
- n.Dump()
-}
-
-func addDemoTab(n *gui.Node, title string) {
- newNode := n.AddTab(title, nil)
- if (gui.Config.Debug) {
- newNode.Dump()
- }
- newNode.ListChildren(false)
-
- groupNode1 := newNode.AddGroup("group 1")
- groupNode1.AddComboBox("demoCombo1", "foo", "bar", "stuff")
- groupNode1.AddComboBox("demoCombo3", "foo 3", "bar", "stuff")
-
- groupNode1.Dump()
-
- butNode1 := groupNode1.AddButton("button1", demoClick)
- butNode1.Dump()
-
- butNode2 := groupNode1.AddButton("button2", demoClick)
- butNode2.Dump()
-
- groupNode2 := newNode.AddGroup("group 2")
- groupNode2.AddComboBox("demoCombo2", "more 1", "more 2", "more 3")
-}
diff --git a/cmds/gui-demo/main.go b/cmds/gui-demo/main.go
index 8eae878..0084e3a 100644
--- a/cmds/gui-demo/main.go
+++ b/cmds/gui-demo/main.go
@@ -22,19 +22,7 @@ func main() {
// This initializes the first window
func initGUI() {
- gui.Config.Title = "WIT GUI Window Demo 1"
- gui.Config.Width = 640
- gui.Config.Height = 480
- gui.Config.Exit = myExit
- node1 := gui.NewWindow()
- addDemoTab(node1, "A Simple Tab Demo")
-
- gui.Config.Title = "WIT GUI Window Demo 2"
- gui.Config.Width = 640
- gui.Config.Height = 240
- gui.Config.Exit = myExit
- node2 := gui.NewWindow()
- node2.DemoAndlabsUiTab("A Simple andlabs/ui Tab Demo")
+ gui.ToolkitDemoWindow()
}
// This demonstrates how to properly interact with the GUI