summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--genericWindow.go33
1 files changed, 18 insertions, 15 deletions
diff --git a/genericWindow.go b/genericWindow.go
index 1324c57..ce5fef8 100644
--- a/genericWindow.go
+++ b/genericWindow.go
@@ -13,14 +13,15 @@ import (
)
type GenericWindow struct {
- Win *BasicWindow // the window widget itself
- Shelf *gui.Node // the overall box: the shelf
- Stack *gui.Node // the first box is a stack
- Top *gui.Node // the first item in the stack is always a shelf like box
- Group *gui.Node // the first item top box is always a group
- Middle *gui.Node // the middle box (shelf style)
- Bottom *gui.Node // the bottom box (stack style)
- Custom func() // a user defined close() window function
+ // Win *BasicWindow // the window widget itself
+ Win *gui.Node // the window widget itself
+ Shelf *gui.Node // the overall box: the shelf
+ Stack *gui.Node // the first box is a stack
+ Top *gui.Node // the first item in the stack is always a shelf like box
+ Group *gui.Node // the first item top box is always a group
+ Middle *gui.Node // the middle box (shelf style)
+ Bottom *gui.Node // the bottom box (stack style)
+ Custom func() // a user defined close() window function
}
func (gw *GenericWindow) Hidden() bool {
@@ -83,21 +84,23 @@ func (gw *GenericWindow) Enable() {
func NewGenericWindow(title string, grouptxt string) *GenericWindow {
gw := new(GenericWindow)
- gw.Win = RawBasicWindow(title)
- gw.Win.Make()
+ // gw.Win = RawBasicWindow(title)
+ gw.Win = gui.RawWindow(title)
+ gw.Win.SetVisable(false)
+ // gw.Win.Make()
gw.Win.Custom = func() {
log.Warn("Found Window close. setting hidden=true")
// sets the hidden flag to false so Toggle() works
gw.Win.Hide()
}
- gw.Shelf = gw.Win.Box()
+ gw.Shelf = gw.Win.NewHorizontalBox("Shelf")
// gw.Shelf.Vertical().SetProgName("ShelfBox")
- gw.Stack = gw.Shelf.NewVerticalBox("Stackbox")
+ gw.Stack = gw.Shelf.NewVerticalBox("Stack")
- gw.Top = gw.Stack.NewVerticalBox("Stackbox")
- gw.Middle = gw.Stack.Box()
- gw.Bottom = gw.Stack.Box()
+ gw.Top = gw.Stack.NewVerticalBox("Top")
+ gw.Middle = gw.Stack.Box().SetProgName("Middle")
+ gw.Bottom = gw.Stack.Box().SetProgName("Bottom")
gw.Group = gw.Top.NewGroup(grouptxt)