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

BUG: fix WxH 

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2021-10-06 01:52:27 -05:00
parent 9dc8d79062
commit facc785798
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
window.go
View File

@ -2,6 +2,7 @@ package gui
import "log" import "log"
import "time" import "time"
import "strconv"
// import "regexp" // import "regexp"
import "github.com/andlabs/ui" import "github.com/andlabs/ui"
@ -60,7 +61,7 @@ func InitWindow(gw *GuiWindow, name string, axis int) *GuiBox {
// This is the first window. One must create it here // This is the first window. One must create it here
if (gw == nil) { if (gw == nil) {
log.Println("initWindow() ADDING ui.NewWindow()") log.Println("initWindow() ADDING ui.NewWindow()")
newGuiWindow.UiWindow = ui.NewWindow(name, int(newGuiWindow.Width), int(newGuiWindow.Height), true) newGuiWindow.UiWindow = ui.NewWindow(name, int(newGuiWindow.Height), int(newGuiWindow.Width), true)
newGuiWindow.UiWindow.SetBorderless(false) newGuiWindow.UiWindow.SetBorderless(false)
// newGuiWindow.UiWindow.SetTitle("test") // newGuiWindow.UiWindow.SetTitle("test")
@ -146,14 +147,16 @@ func CreateWindow(title string, tabname string, x int, y int, custom func() ui.C
} }
func CreateBlankWindow(title string, x int, y int) *GuiBox { func CreateBlankWindow(title string, x int, y int) *GuiBox {
window := ui.NewWindow(title, x, y, false) box := mapWindow(nil, title, x, y)
window := ui.NewWindow(box.Name, x, y, false)
window.SetBorderless(false) window.SetBorderless(false)
window.OnClosing(func(*ui.Window) bool { window.OnClosing(func(*ui.Window) bool {
log.Println("createWindow().OnClosing()", title) log.Println("createWindow().OnClosing()", box.Name)
return true return true
}) })
ui.OnShouldQuit(func() bool { ui.OnShouldQuit(func() bool {
log.Println("createWindow().Destroy()", title) log.Println("createWindow().Destroy()", box.Name)
window.Destroy() window.Destroy()
return true return true
}) })
@ -161,7 +164,8 @@ func CreateBlankWindow(title string, x int, y int) *GuiBox {
window.SetMargined(true) window.SetMargined(true)
window.Show() window.Show()
return mapWindow(window, title, x, y) box.Window.UiWindow = window
return box
} }
func initBlankWindow() ui.Control { func initBlankWindow() ui.Control {
@ -176,7 +180,8 @@ var master = 0
func mapWindow(window *ui.Window, title string, x int, y int) *GuiBox { func mapWindow(window *ui.Window, title string, x int, y int) *GuiBox {
if (Data.WindowMap[title] != nil) { if (Data.WindowMap[title] != nil) {
log.Println("Data.WindowMap[title] already exists title =", title) log.Println("Data.WindowMap[title] already exists title =", title)
title = title + string(master) master = master + 1
title = title + " jcarr " + strconv.Itoa(master)
} }
if (Data.WindowMap[title] != nil) { if (Data.WindowMap[title] != nil) {
log.Println("Data.WindowMap[title] already exists title =", title) log.Println("Data.WindowMap[title] already exists title =", title)