diff options
| -rw-r--r-- | area.go | 51 | ||||
| -rw-r--r-- | gui.go | 14 | ||||
| -rw-r--r-- | package | 0 | ||||
| -rw-r--r-- | structs.go | 9 |
4 files changed, 45 insertions, 29 deletions
@@ -1,32 +1,51 @@ package gui import "log" +import "time" import "github.com/andlabs/ui" import _ "github.com/andlabs/ui/winmanifest" import "github.com/davecgh/go-spew/spew" +func findFB(button *ButtonMap) *ButtonMap { + var a *ButtonMap + for key, foo := range Data.AllButtons { + log.Println("defaultButtonClick() Data.AllButtons =", key, foo) + // if Data.AllButtons[key] == *button { + if &foo == button { + a = &foo + } + } + return a +} + func makeSplashArea() *AreaHandler { // make this button just to get the default font (but don't display the button) // There should be another way to do this (?) - Data.fontButton = CreateFontButton("SplashFont", "DONE") + newB := CreateFontButton("AREA") - myAH.Attrstr = makeAttributedString() - Data.splashArea = ui.NewArea(myAH) - Data.MyArea = Data.splashArea - myAH.Area = Data.splashArea + time.Sleep(200 * time.Millisecond) + tmp := findFB(newB) + log.Println("makeSplashArea() newB =", newB) + log.Println("makeSplashArea() newB.AH =", newB.AH) + log.Println("makeSplashArea() newB =", newB) + newB.AH = &myAH + // log.Println("makeSplashArea() newB.AH =", newB.AH) + log.Println("makeSplashArea() newB =", newB) + + time.Sleep(200 * time.Millisecond) + tmp = findFB(newB) + log.Println("makeSplashArea() tmp =", tmp, "newB", newB) - // create a 'fake' button entry for the mouse clicks - var newmap ButtonMap - newmap.Action = "AREA" - newmap.AH = &myAH - newmap.A = Data.splashArea - myAH.Button = &newmap - Data.AllButtons = append(Data.AllButtons, newmap) + myAH.Attrstr = makeAttributedString() + myAH.Area = ui.NewArea(myAH) + newB.A = myAH.Area + myAH.FontButton = newB.FB + myAH.Button = newB if (Data.Debug) { - spew.Dump(Data.splashArea) + spew.Dump(myAH.Area) log.Println("DEBUGGING", Data.Debug) } else { log.Println("NOT DEBUGGING AREA mhAH.Button =", myAH.Button) @@ -45,8 +64,8 @@ func appendWithAttributes(newText *ui.AttributedString, what string, attrs ...ui func (ah AreaHandler) Draw(a *ui.Area, p *ui.AreaDrawParams) { tl := ui.DrawNewTextLayout(&ui.DrawTextLayoutParams{ - String: myAH.Attrstr, - DefaultFont: Data.fontButton.Font(), + String: ah.Attrstr, + DefaultFont: ah.FontButton.Font(), Width: p.AreaWidth, Align: ui.DrawTextAlign(1), }) @@ -66,7 +85,7 @@ func (ah AreaHandler) MouseEvent(a *ui.Area, me *ui.AreaMouseEvent) { log.Println("GOT MOUSE UP") log.Println("GOT MOUSE UP") log.Println("GOT MOUSE UP") - mouseClick(myAH.Button) + mouseClick(ah.Button) } } @@ -225,17 +225,17 @@ func CreateButton(a *pb.Account, vm *pb.Event_VM, return newB } -func CreateFontButton(action string, note string) *ui.FontButton { +func CreateFontButton(action string) *ButtonMap { newB := ui.NewFontButton() // create a 'fake' button entry for the mouse clicks - var newButtonMap ButtonMap - newButtonMap.Action = action - newButtonMap.FB = newB - Data.AllButtons = append(Data.AllButtons, newButtonMap) + var newBM ButtonMap + newBM.Action = action + newBM.FB = newB + Data.AllButtons = append(Data.AllButtons, newBM) newB.OnChanged(func (*ui.FontButton) { - mouseClick(&newButtonMap) + mouseClick(&newBM) }) - return newB + return &newBM } @@ -63,15 +63,10 @@ type GuiDataStructure struct { cloudBox *ui.Box smallBox *ui.Box -// mainwin *ui.Window -// maintab *ui.Tab tabcount int // stuff for the 'area' - MyArea *ui.Area - fontButton *ui.FontButton - attrstr *ui.AttributedString - splashArea *ui.Area +// fontButton *ui.FontButton } type TableColumnData struct { @@ -123,6 +118,8 @@ type AreaHandler struct{ Button *ButtonMap Attrstr *ui.AttributedString Area *ui.Area + FontButton *ui.FontButton + FB func () *ButtonMap } // AREA STRUCTURES END |