EXAMPLE: further improvements to the example
Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
parent
02943567b1
commit
07061a47e7
14
Makefile
14
Makefile
|
@ -1,5 +1,13 @@
|
||||||
|
all:
|
||||||
|
@echo
|
||||||
|
@echo "make examples # will run all the examples"
|
||||||
|
@echo "make update # full git update"
|
||||||
|
@echo
|
||||||
|
|
||||||
# should update every go dependancy (?)
|
# should update every go dependancy (?)
|
||||||
update:
|
update:
|
||||||
# git pull
|
git pull
|
||||||
wit go update
|
go get -v -t -u ./...
|
||||||
# go get -v -t -u ./...
|
|
||||||
|
examples:
|
||||||
|
make -C gui-example
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
run: build
|
run: build
|
||||||
~/go/bin/gui-example
|
./gui-example
|
||||||
|
|
||||||
build:
|
build:
|
||||||
GO111MODULE="off" go install
|
GO111MODULE="off" go build
|
||||||
|
|
|
@ -16,8 +16,8 @@ func customExit(gw *gui.GuiWindow) {
|
||||||
func main() {
|
func main() {
|
||||||
log.Println("starting my Control Panel")
|
log.Println("starting my Control Panel")
|
||||||
|
|
||||||
gui.Config.Width = 1000
|
gui.Config.Width = 800
|
||||||
gui.Config.Height = 400
|
gui.Config.Height = 300
|
||||||
gui.Config.Exit = customExit
|
gui.Config.Exit = customExit
|
||||||
|
|
||||||
go gui.Main(initGUI)
|
go gui.Main(initGUI)
|
||||||
|
@ -37,7 +37,7 @@ func watchGUI() {
|
||||||
time.Sleep(time.Second)
|
time.Sleep(time.Second)
|
||||||
if i == 3 {
|
if i == 3 {
|
||||||
log.Println("Sending ExampleWindow to gui.Queue()")
|
log.Println("Sending ExampleWindow to gui.Queue()")
|
||||||
gui.Queue(gui.ExampleWindow)
|
gui.Queue(gui.DebugWindow)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
12
main.go
12
main.go
|
@ -23,7 +23,6 @@ func Queue(f func()) {
|
||||||
ui.QueueMain(f)
|
ui.QueueMain(f)
|
||||||
}
|
}
|
||||||
|
|
||||||
// gui.Main(gui.MainExample())
|
|
||||||
func ExampleWindow() {
|
func ExampleWindow() {
|
||||||
log.Println("START gui.ExampleWindow()")
|
log.Println("START gui.ExampleWindow()")
|
||||||
|
|
||||||
|
@ -37,12 +36,15 @@ func ExampleWindow() {
|
||||||
window.UiWindow.Show()
|
window.UiWindow.Show()
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestExample() {
|
func DebugWindow() {
|
||||||
log.Println("gui.initUI() inside ui.Main()")
|
log.Println("START gui.ExampleWindow()")
|
||||||
|
|
||||||
box := InitWindow(nil, "test", 0)
|
title := "Debug Window"
|
||||||
|
box := InitWindow(nil, title, 0)
|
||||||
window := box.Window
|
window := box.Window
|
||||||
log.Println("StartNewWindow() box =", box)
|
log.Println("box =", box)
|
||||||
|
log.Println("window =", window)
|
||||||
|
box.AddDebugTab("jcarr Debug")
|
||||||
|
|
||||||
window.UiWindow.Show()
|
window.UiWindow.Show()
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +1,12 @@
|
||||||
package gui
|
package gui
|
||||||
|
|
||||||
import "log"
|
import (
|
||||||
import "github.com/andlabs/ui"
|
"log"
|
||||||
import _ "github.com/andlabs/ui/winmanifest"
|
|
||||||
|
|
||||||
import "github.com/davecgh/go-spew/spew"
|
"github.com/andlabs/ui"
|
||||||
|
_ "github.com/andlabs/ui/winmanifest"
|
||||||
|
"github.com/davecgh/go-spew/spew"
|
||||||
|
)
|
||||||
|
|
||||||
var names = make([]string, 100)
|
var names = make([]string, 100)
|
||||||
|
|
||||||
|
@ -12,12 +14,12 @@ func makeWindowDebug() ui.Control {
|
||||||
hbox := ui.NewHorizontalBox()
|
hbox := ui.NewHorizontalBox()
|
||||||
hbox.SetPadded(true)
|
hbox.SetPadded(true)
|
||||||
|
|
||||||
/////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////
|
||||||
vbox := addGroup(hbox, "Numbers")
|
vbox := addGroup(hbox, "Numbers")
|
||||||
pbar := ui.NewProgressBar()
|
pbar := ui.NewProgressBar()
|
||||||
vbox.Append(pbar, false)
|
vbox.Append(pbar, false)
|
||||||
|
|
||||||
/////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////
|
||||||
vbox = addGroup(hbox, "WindowMap 2")
|
vbox = addGroup(hbox, "WindowMap 2")
|
||||||
cbox := ui.NewCombobox()
|
cbox := ui.NewCombobox()
|
||||||
|
|
||||||
|
@ -35,7 +37,7 @@ func makeWindowDebug() ui.Control {
|
||||||
dumpBox(names[x])
|
dumpBox(names[x])
|
||||||
})
|
})
|
||||||
|
|
||||||
/////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////
|
||||||
vbox = addGroup(hbox, "Buttons")
|
vbox = addGroup(hbox, "Buttons")
|
||||||
|
|
||||||
b1 := addButton(vbox, "dumpBox(name)")
|
b1 := addButton(vbox, "dumpBox(name)")
|
||||||
|
@ -46,6 +48,16 @@ func makeWindowDebug() ui.Control {
|
||||||
dumpBox(names[x])
|
dumpBox(names[x])
|
||||||
})
|
})
|
||||||
|
|
||||||
|
dump2 := addButton(vbox, "Dump Boxes")
|
||||||
|
dump2.OnClicked(func(*ui.Button) {
|
||||||
|
DumpBoxes()
|
||||||
|
})
|
||||||
|
|
||||||
|
dump1 := addButton(vbox, "Dump MAP")
|
||||||
|
dump1.OnClicked(func(*ui.Button) {
|
||||||
|
DumpMap()
|
||||||
|
})
|
||||||
|
|
||||||
b2 := addButton(vbox, "SetMargined()")
|
b2 := addButton(vbox, "SetMargined()")
|
||||||
b2.OnClicked(func(*ui.Button) {
|
b2.OnClicked(func(*ui.Button) {
|
||||||
x := cbox.Selected()
|
x := cbox.Selected()
|
||||||
|
@ -53,13 +65,13 @@ func makeWindowDebug() ui.Control {
|
||||||
log.Println("findBox; names[x] =", names[x])
|
log.Println("findBox; names[x] =", names[x])
|
||||||
findBox(names[x])
|
findBox(names[x])
|
||||||
gw := findBox(names[x])
|
gw := findBox(names[x])
|
||||||
if (gw == nil) {
|
if gw == nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (gw.UiTab == nil) {
|
if gw.UiTab == nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (gw.TabNumber == nil) {
|
if gw.TabNumber == nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
scs := spew.ConfigState{MaxDepth: 1}
|
scs := spew.ConfigState{MaxDepth: 1}
|
||||||
|
@ -76,10 +88,10 @@ func makeWindowDebug() ui.Control {
|
||||||
log.Println("findBox; names[x] =", names[x])
|
log.Println("findBox; names[x] =", names[x])
|
||||||
findBox(names[x])
|
findBox(names[x])
|
||||||
gw := findBox(names[x])
|
gw := findBox(names[x])
|
||||||
if (gw == nil) {
|
if gw == nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (gw.UiTab == nil) {
|
if gw.UiTab == nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
gw.UiTab.Hide()
|
gw.UiTab.Hide()
|
||||||
|
@ -92,10 +104,10 @@ func makeWindowDebug() ui.Control {
|
||||||
log.Println("findBox; names[x] =", names[x])
|
log.Println("findBox; names[x] =", names[x])
|
||||||
findBox(names[x])
|
findBox(names[x])
|
||||||
gw := findBox(names[x])
|
gw := findBox(names[x])
|
||||||
if (gw == nil) {
|
if gw == nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (gw.UiTab == nil) {
|
if gw.UiTab == nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
gw.UiTab.Show()
|
gw.UiTab.Show()
|
||||||
|
@ -108,13 +120,13 @@ func makeWindowDebug() ui.Control {
|
||||||
log.Println("findBox; names[x] =", names[x])
|
log.Println("findBox; names[x] =", names[x])
|
||||||
findBox(names[x])
|
findBox(names[x])
|
||||||
gw := findBox(names[x])
|
gw := findBox(names[x])
|
||||||
if (gw == nil) {
|
if gw == nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (gw.UiTab == nil) {
|
if gw.UiTab == nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (gw.TabNumber == nil) {
|
if gw.TabNumber == nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
gw.UiTab.Delete(*gw.TabNumber)
|
gw.UiTab.Delete(*gw.TabNumber)
|
||||||
|
@ -145,7 +157,7 @@ func addGroup(b *ui.Box, name string) *ui.Box {
|
||||||
|
|
||||||
func findBox(s string) *GuiWindow {
|
func findBox(s string) *GuiWindow {
|
||||||
for name, window := range Data.WindowMap {
|
for name, window := range Data.WindowMap {
|
||||||
if (name == s) {
|
if name == s {
|
||||||
return window
|
return window
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -154,11 +166,11 @@ func findBox(s string) *GuiWindow {
|
||||||
|
|
||||||
func dumpBox(s string) {
|
func dumpBox(s string) {
|
||||||
for name, window := range Data.WindowMap {
|
for name, window := range Data.WindowMap {
|
||||||
if (name != s) {
|
if name != s {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
log.Println("gui.DumpBoxes() MAP: ", name)
|
log.Println("gui.DumpBoxes() MAP: ", name)
|
||||||
if (window.TabNumber == nil) {
|
if window.TabNumber == nil {
|
||||||
log.Println("gui.DumpBoxes() \tWindows.TabNumber = nil")
|
log.Println("gui.DumpBoxes() \tWindows.TabNumber = nil")
|
||||||
} else {
|
} else {
|
||||||
log.Println("gui.DumpBoxes() \tWindows.TabNumber =", *window.TabNumber)
|
log.Println("gui.DumpBoxes() \tWindows.TabNumber =", *window.TabNumber)
|
||||||
|
@ -169,18 +181,18 @@ func dumpBox(s string) {
|
||||||
log.Println("gui.DumpBoxes()\tWindow.UiTab =", window.UiTab)
|
log.Println("gui.DumpBoxes()\tWindow.UiTab =", window.UiTab)
|
||||||
for name, abox := range window.BoxMap {
|
for name, abox := range window.BoxMap {
|
||||||
log.Printf("gui.DumpBoxes() \tBOX mapname=%-12s abox.Name=%-12s", name, abox.Name)
|
log.Printf("gui.DumpBoxes() \tBOX mapname=%-12s abox.Name=%-12s", name, abox.Name)
|
||||||
if (name == "MAINBOX") {
|
if name == "MAINBOX" {
|
||||||
if (Config.Debug) {
|
if Config.Debug {
|
||||||
scs := spew.ConfigState{MaxDepth: 1}
|
scs := spew.ConfigState{MaxDepth: 1}
|
||||||
scs.Dump(abox.UiBox)
|
scs.Dump(abox.UiBox)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (window.UiTab != nil) {
|
if window.UiTab != nil {
|
||||||
pages := window.UiTab.NumPages()
|
pages := window.UiTab.NumPages()
|
||||||
log.Println("gui.DumpBoxes()\tWindow.UiTab.NumPages() =", pages)
|
log.Println("gui.DumpBoxes()\tWindow.UiTab.NumPages() =", pages)
|
||||||
tabSetMargined(window.UiTab)
|
tabSetMargined(window.UiTab)
|
||||||
if (Config.Debug) {
|
if Config.Debug {
|
||||||
scs := spew.ConfigState{MaxDepth: 2}
|
scs := spew.ConfigState{MaxDepth: 2}
|
||||||
scs.Dump(window.UiTab)
|
scs.Dump(window.UiTab)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue