protobuf stuff

checkbox.go

@@ -23,16 +23,16 @@ func setChecked(n *tree.Node, b bool) {
 
 // redraw the checkbox
 func (tk *guiWidget) setCheckbox() {
-	if tk.node.WidgetType != widget.Checkbox {
+	if tk.WidgetType() != widget.Checkbox {
-		log.Log(WARN, "setCheckbox() being run on widget:", tk.node.WidgetType)
+		log.Log(WARN, "setCheckbox() being run on widget:", tk.WidgetType())
 		return
 	}
-	if tk.node.State.Checked {
+	if tk.Checked() {
-		log.Log(WARN, "setCheckbox() got true", tk.node.State.Checked)
+		log.Log(WARN, "setCheckbox() got true", tk.Checked())
-		tk.labelN = "X " + tk.node.State.Label
+		tk.labelN = "X " + tk.GetLabel()
 	} else {
-		log.Log(WARN, "setCheckbox() got false", tk.node.State.Checked)
+		log.Log(WARN, "setCheckbox() got false", tk.Checked())
-		tk.labelN = "_ " + tk.node.State.Label
+		tk.labelN = "_ " + tk.GetLabel()
 	}
 
 	tk.Hide()

eventMouseClick.go

@@ -60,7 +60,7 @@ func doMouseClick(w int, h int) {
 	for _, tk := range win.findByXYreal(w, h) {
 		switch tk.WidgetType() {
 		case widget.Checkbox:
-			if tk.node.State.Checked {
+			if tk.Checked() {
 				log.Log(WARN, "checkbox is being set to false")
 				tk.node.State.Checked = false
 				tk.setCheckbox()

size.go

@@ -9,19 +9,6 @@ import (
 	"go.wit.com/widget"
 )
 
-func (tk *guiWidget) Hidden() bool {
-	if tk.parent == nil {
-		return tk.node.Hidden()
-	}
-	if tk.parent.node.WidgetId == 0 {
-		return tk.node.Hidden()
-	}
-	if tk.parent.Hidden() {
-		return true
-	}
-	return tk.node.Hidden()
-}
-
 func (tk *guiWidget) Size() (int, int) {
 	if tk == nil {
 		return 0, 0
@@ -139,7 +126,7 @@ func (w *guiWidget) sizeBox() (int, int) {
 			continue
 		}
 		sizeW, sizeH := child.Size()
-		if child.node.State.Direction == widget.Vertical {
+		if child.Direction() == widget.Vertical {
 			maxW += sizeW
 			if sizeH > maxH {
 				maxH = sizeH

treeAdd.go

@@ -67,7 +67,7 @@ func addWidget(n *tree.Node) {
 		return
 	case widget.Button:
 		tk.setColorButton()
-		if tk.node.IsEnabled() {
+		if tk.IsEnabled() {
 		} else {
 			tk.setColorDisable()
 		}

treeWidget.go

@@ -171,3 +171,27 @@ func (tk *guiWidget) GetLabel() string {
 func (tk *guiWidget) IsEnabled() bool {
 	return tk.node.IsEnabled()
 }
+
+func (tk *guiWidget) Checked() bool {
+	return tk.node.State.Checked
+}
+
+func (tk *guiWidget) Hidden() bool {
+	if tk.node == nil {
+		return false
+	}
+	if tk.parent == nil {
+		return tk.node.Hidden()
+	}
+	if tk.parent.WidgetId() == 0 {
+		return tk.node.Hidden()
+	}
+	if tk.parent.Hidden() {
+		return true
+	}
+	return tk.node.Hidden()
+}
+
+func (tk *guiWidget) Direction() widget.Orientation {
+	return tk.node.State.Direction
+}