jcarr
/
new-gui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more removals and cleanups 

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2019-06-02 11:40:44 -07:00
parent b57b12549e
commit 43dbe18798
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
box.go
View File

@ -19,18 +19,27 @@ func add(box *GuiBox, newbox *GuiBox) {
log.Println("gui.add() START newbox =", newbox) log.Println("gui.add() START newbox =", newbox)
if (box == nil) { if (box == nil) {
log.Println("\tgui.add() add to Window as MAINBOX") log.Println("\tgui.add() add to Window as MAINBOX")
newbox.Window.BoxMap["MAINBOX"] = newbox
if (newbox.Window.UiTab != nil) { if (newbox.Window.UiTab != nil) {
// create a new tab here
// add the box to it as MAINBOX
log.Println("\tgui.add() add to Window as a UiTab") log.Println("\tgui.add() add to Window as a UiTab")
newbox.Window.UiTab.InsertAt(newbox.Name, 0, newbox.UiBox) newbox.Window.UiTab.InsertAt(newbox.Name, 0, newbox.UiBox)
newbox.Window.UiTab.SetMargined(0, true) newbox.Window.UiTab.SetMargined(0, true)
// create a new tab here
// add the box to it as MAINBOX // TODO: figure out how to make a new Tab/Window/Box here
// window := InitGuiWindow(Data.Config, newbox.Name, gw.MakeWindow, gw.UiWindow, gw.UiTab)
// window.UiTab.Delete(0)
// window.MakeWindow(window)
// newbox.Window = window
newbox.Window.BoxMap["MAINBOX"] = newbox
log.Println("gui.add() END")
return
} else { } else {
log.Println("\tgui.add() DONT KNOW HOW TO ADD TO A RAW WINDOW YET") log.Println("\tgui.add() ERROR DONT KNOW HOW TO ADD TO A RAW WINDOW YET")
// add this to the window // add this to the window
} }
log.Println("\tgui.add() add to Window as MAINBOX DONE") log.Println("\tgui.add() ERROR DON'T KNOW HOW TO add to Window as MAINBOX DONE")
log.Println("gui.add() END") log.Println("gui.add() END")
return return
} }

35
misc.go
View File

@ -3,7 +3,7 @@ package gui
import "log" import "log"
import "time" import "time"
import "regexp" import "regexp"
import "os" // import "os"
import "github.com/andlabs/ui" import "github.com/andlabs/ui"
import _ "github.com/andlabs/ui/winmanifest" import _ "github.com/andlabs/ui/winmanifest"
@ -14,26 +14,28 @@ import pb "git.wit.com/wit/witProtobuf"
// THIS IS NOT CLEAN (almost?) // THIS IS NOT CLEAN (almost?)
func ShowTab(gw *GuiWindow, tabname string, title string) *GuiWindow { const Xaxis = 0
log.Println("ShowTab() gw =", gw) const Yaxis = 1
/*
func ReplaceTab(gw *GuiWindow, tabname string, title string) {
log.Println("ReplaceTab() gw =", gw)
if (gw.UiTab == nil) { if (gw.UiTab == nil) {
log.Println("ShowTab() gw.UiTab = nil THIS IS BAD") log.Println("\tShowTab() gw.UiTab = nil THIS IS BAD")
os.Exit(-1) os.Exit(-1)
} }
window := InitGuiWindow(Data.Config, tabname, gw.MakeWindow, gw.UiWindow, gw.UiTab) window := InitGuiWindow(Data.Config, tabname, gw.MakeWindow, gw.UiWindow, gw.UiTab)
window.UiTab.Delete(0) window.UiTab.Delete(0)
window.MakeWindow(window)
abox := window.MakeWindow(window)
// add(nil, abox) // add(nil, abox)
log.Println("ShowTab() NOT INSERTING TAB abox =", abox) log.Println("\tShowTab() NOT INSERTING TAB")
log.Println("ShowTab() NOT INSERTING TAB") log.Println("\tShowTab() NOT INSERTING TAB")
log.Println("ShowTab() NOT INSERTING TAB") log.Println("\tShowTab() NOT INSERTING TAB")
log.Println("ShowTab() NOT INSERTING TAB")
// window.BoxMap[tabname] = abox // window.BoxMap[tabname] = abox
// window.UiTab.InsertAt(title, 0, abox.UiBox) // window.UiTab.InsertAt(title, 0, abox.UiBox)
// window.UiTab.SetMargined(0, true) // window.UiTab.SetMargined(0, true)
return window
} }
*/
func GuiInit() { func GuiInit() {
ui.OnShouldQuit(func() bool { ui.OnShouldQuit(func() bool {
@ -113,17 +115,6 @@ func InitGuiWindow(c *pb.Config, action string, maketab func(*GuiWindow) *GuiBox
func StartNewWindow(c *pb.Config, bg bool, action string, maketab func(*GuiWindow) *GuiBox) { func StartNewWindow(c *pb.Config, bg bool, action string, maketab func(*GuiWindow) *GuiBox) {
log.Println("InitNewWindow() Create a new window") log.Println("InitNewWindow() Create a new window")
window := InitGuiWindow(c, action, maketab, nil, nil) window := InitGuiWindow(c, action, maketab, nil, nil)
/*
newGuiWindow.Width = int(c.Width)
newGuiWindow.Height = int(c.Height)
newGuiWindow.Action = action
newGuiWindow.MakeWindow = maketab
newGuiWindow.BoxMap = make(map[string]*GuiBox)
newGuiWindow.EntryMap = make(map[string]*GuiEntry)
newGuiWindow.EntryMap["test"] = nil
Data.Windows = append(Data.Windows, &newGuiWindow)
*/
if (bg) { if (bg) {
log.Println("ShowWindow() IN NEW GOROUTINE") log.Println("ShowWindow() IN NEW GOROUTINE")
go ui.Main(func() { go ui.Main(func() {