From 269490693ec8a153ab7d6718d9ecd7e09b6c322d Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sun, 14 Jan 2024 10:36:46 -0600 Subject: [PATCH] margin works Signed-off-by: Jeff Carr --- main.go | 50 +++++++++++++++++++++++++------------------------- structs.go | 16 +++++++--------- 2 files changed, 32 insertions(+), 34 deletions(-) diff --git a/main.go b/main.go index 38280fa..ec742d9 100644 --- a/main.go +++ b/main.go @@ -75,27 +75,25 @@ func addRepo(grid *gui.Node, path string, master string, devel string, user stri // This creates a window func repoworld() { - win := gadgets.NewBasicWindow(myGui, "git autotypist. it types faster than you can.") - win.Make() + reposwin = gadgets.NewBasicWindow(myGui, "git autotypist. it types faster than you can.") + reposwin.Make() - box := win.Box().NewBox("bw vbox", false) - // box2 := win.Box().NewBox("bw vbox", false) - group := box.NewGroup("go repositories (read from ~/.config/myrepolist)") - grid := group.NewGrid("test", 11, 1) - grid.Margin() + reposbox = reposwin.Box().NewBox("bw vbox", false) + reposgroup = reposbox.NewGroup("go repositories (read from ~/.config/myrepolist)") + reposgrid = reposgroup.NewGrid("test", 11, 1) - grid.NewLabel("") - grid.NewLabel("branch") - grid.NewLabel("last tag") - grid.NewLabel("Current Version") - // grid.NewLabel("tags") - grid.NewLabel("master") - grid.NewLabel("devel") - grid.NewLabel("user") - grid.NewLabel("Status") - grid.NewLabel("commit") - grid.NewLabel("Toggle()") - grid.NewLabel("Draw()") + reposgrid.NewLabel("") + reposgrid.NewLabel("branch") + reposgrid.NewLabel("last tag") + reposgrid.NewLabel("Current Version") + // reposgrid.NewLabel("tags") + reposgrid.NewLabel("master") + reposgrid.NewLabel("devel") + reposgrid.NewLabel("user") + reposgrid.NewLabel("Status") + reposgrid.NewLabel("commit") + reposgrid.NewLabel("Toggle()") + reposgrid.NewLabel("Draw()") repos := myrepolist() for _, line := range repos { @@ -105,13 +103,15 @@ func repoworld() { if dbranch == "" { dbranch = "devel" } usr, _ := user.Current() if ubranch == "" { ubranch = usr.Username } - addRepo(grid, path, mbranch, dbranch, ubranch) + addRepo(reposgrid, path, mbranch, dbranch, ubranch) } - box2 := win.Box().NewBox("bw vbox", false) - box2.NewButton("grid.Margin()", func () { - grid.Margin() - grid.Pad() + box2 := reposwin.Box().NewBox("bw vbox", false) + box2.NewButton("reposgrid.Margin()", func () { + log.Warn("reposgrid.Margin() RUN NOW") + reposgrid.Margin() + log.Warn("reposgrid.Pad() RUN NOW") + reposgrid.Pad() }) box2.NewButton("status.Update() all", func () { @@ -126,5 +126,5 @@ func repoworld() { } }) - win.Draw() + reposwin.Draw() } diff --git a/structs.go b/structs.go index b56cbc1..773da16 100644 --- a/structs.go +++ b/structs.go @@ -1,20 +1,18 @@ -// This is a simple example +// watch all your go git repos package main import ( -// "os/user" -// "io/ioutil" -// "strings" - -// "go.wit.com/log" - "go.wit.com/gui/gui" -// "go.wit.com/gui/gadgets" + "go.wit.com/gui/gadgets" "go.wit.com/gui/gadgets/repostatus" -// "go.wit.com/apps/control-panel-dns/smartwindow" ) +// the main window nodes var myGui *gui.Node +var reposwin *gadgets.BasicWindow +var reposbox *gui.Node +var reposgrid *gui.Node +var reposgroup *gui.Node var allrepos []*repo