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

REFACTOR: things are back to working as they were 

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2021-10-06 14:32:07 -05:00
parent 908615c038
commit 2ccc1b518d
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
structs.go
View File

@ -122,7 +122,8 @@ func (s GuiBox) Append(child ui.Control, x bool) {
s.UiBox.Append(child, x) s.UiBox.Append(child, x)
} }
func (w GuiWindow) InitBox(title string) *GuiBox { /*
func (w GuiWindow) InitWindow(title string) *GuiBox {
if w.UiWindow == nil { if w.UiWindow == nil {
log.Println("gui.InitBox() THIS SHOULD NEVER HAPPEN. Window doesn't exist", w) log.Println("gui.InitBox() THIS SHOULD NEVER HAPPEN. Window doesn't exist", w)
return nil return nil
@ -131,14 +132,15 @@ func (w GuiWindow) InitBox(title string) *GuiBox {
w.UiWindow.SetChild(tab) w.UiWindow.SetChild(tab)
w.UiWindow.SetMargined(true) w.UiWindow.SetMargined(true)
tab.Append(title, initBlankWindow()) tab.Append(title, InitBlankWindow())
tab.SetMargined(0, true) tab.SetMargined(0, true)
w.UiTab = tab w.UiTab = tab
return nil return nil
} }
*/
func (s GuiBox) InitTab(title string) *ui.Tab { func (s GuiBox) InitTab(title string, custom func() ui.Control) *ui.Tab {
if s.Window == nil { if s.Window == nil {
return nil return nil
} }
@ -151,7 +153,7 @@ func (s GuiBox) InitTab(title string) *ui.Tab {
window.SetChild(tab) window.SetChild(tab)
window.SetMargined(true) window.SetMargined(true)
tab.Append(title, initBlankWindow()) tab.Append(title, custom())
tab.SetMargined(0, true) tab.SetMargined(0, true)
// tab.SetMargined(1, true) // tab.SetMargined(1, true)
@ -187,7 +189,7 @@ func (s GuiBox) AddTab2(title string, custom ui.Control) *ui.Tab {
} }
func (s GuiBox) AddBoxTab(title string) *GuiBox { func (s GuiBox) AddBoxTab(title string) *GuiBox {
uiTab := s.AddTab2(title, initBlankWindow()) uiTab := s.AddTab2(title, InitBlankWindow())
tabSetMargined(uiTab) tabSetMargined(uiTab)
var box *GuiBox var box *GuiBox

7
window.go
View File

@ -146,7 +146,7 @@ func DeleteWindow(name string) {
func CreateWindow(title string, tabname string, x int, y int, custom func() ui.Control) *GuiBox { func CreateWindow(title string, tabname string, x int, y int, custom func() ui.Control) *GuiBox {
box := CreateBlankWindow(title, x, y) box := CreateBlankWindow(title, x, y)
box.InitTab(title) box.InitTab(title, custom)
return box return box
} }
@ -173,7 +173,7 @@ func CreateBlankWindow(title string, x int, y int) *GuiBox {
return box return box
} }
func initBlankWindow() ui.Control { func InitBlankWindow() ui.Control {
hbox := ui.NewHorizontalBox() hbox := ui.NewHorizontalBox()
hbox.SetPadded(true) hbox.SetPadded(true)
@ -215,7 +215,7 @@ func mapWindow(window *ui.Window, title string, x int, y int) *GuiBox {
return &box return &box
} }
func NewWindow(title string, x int, y int) { func NewWindow(title string, x int, y int) *GuiBox {
box := mapWindow(nil, title, x, y) box := mapWindow(nil, title, x, y)
log.Println("gui.NewWindow() title = box.Name =", box.Name) log.Println("gui.NewWindow() title = box.Name =", box.Name)
@ -235,4 +235,5 @@ func NewWindow(title string, x int, y int) {
window.Show() window.Show()
box.Window.UiWindow = window box.Window.UiWindow = window
return box
} }