From dc4b3a36621aba3f6d5b4c62c03dc8c295a6ef4f Mon Sep 17 00:00:00 2001 From: Tim Cooper Date: Sat, 6 Dec 2014 21:48:11 -0400 Subject: [PATCH] uiterm: make View interface methods private --- uiterm/label.go | 10 +++++----- uiterm/textbox.go | 14 +++++++------- uiterm/textview.go | 10 +++++----- uiterm/tree.go | 10 +++++----- uiterm/ui.go | 12 ++++++------ uiterm/view.go | 10 +++++----- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/uiterm/label.go b/uiterm/label.go index 3e772e5..cde1de1 100644 --- a/uiterm/label.go +++ b/uiterm/label.go @@ -14,17 +14,17 @@ type Label struct { x0, y0, x1, y1 int } -func (l *Label) SetActive(ui *Ui, active bool) { +func (l *Label) setActive(ui *Ui, active bool) { } -func (l *Label) SetBounds(ui *Ui, x0, y0, x1, y1 int) { +func (l *Label) setBounds(ui *Ui, x0, y0, x1, y1 int) { l.x0 = x0 l.y0 = y0 l.x1 = x1 l.y1 = y1 } -func (l *Label) Draw(ui *Ui) { +func (l *Label) draw(ui *Ui) { reader := strings.NewReader(l.Text) for y := l.y0; y < l.y1; y++ { for x := l.x0; x < l.x1; x++ { @@ -39,8 +39,8 @@ func (l *Label) Draw(ui *Ui) { } } -func (l *Label) KeyEvent(ui *Ui, mod Modifier, key Key) { +func (l *Label) keyEvent(ui *Ui, mod Modifier, key Key) { } -func (l *Label) CharacterEvent(ui *Ui, chr rune) { +func (l *Label) characterEvent(ui *Ui, chr rune) { } diff --git a/uiterm/textbox.go b/uiterm/textbox.go index 54726cd..a1b38b4 100644 --- a/uiterm/textbox.go +++ b/uiterm/textbox.go @@ -20,18 +20,18 @@ type Textbox struct { x0, y0, x1, y1 int } -func (t *Textbox) SetBounds(ui *Ui, x0, y0, x1, y1 int) { +func (t *Textbox) setBounds(ui *Ui, x0, y0, x1, y1 int) { t.x0 = x0 t.y0 = y0 t.x1 = x1 t.y1 = y1 } -func (t *Textbox) SetActive(ui *Ui, active bool) { +func (t *Textbox) setActive(ui *Ui, active bool) { t.active = active } -func (t *Textbox) Draw(ui *Ui) { +func (t *Textbox) draw(ui *Ui) { var setCursor = false reader := strings.NewReader(t.Text) for y := t.y0; y < t.y1; y++ { @@ -51,7 +51,7 @@ func (t *Textbox) Draw(ui *Ui) { } } -func (t *Textbox) KeyEvent(ui *Ui, mod Modifier, key Key) { +func (t *Textbox) keyEvent(ui *Ui, mod Modifier, key Key) { redraw := false switch key { case KeyCtrlC: @@ -76,13 +76,13 @@ func (t *Textbox) KeyEvent(ui *Ui, mod Modifier, key Key) { } } if redraw { - t.Draw(ui) + t.draw(ui) termbox.Flush() } } -func (t *Textbox) CharacterEvent(ui *Ui, chr rune) { +func (t *Textbox) characterEvent(ui *Ui, chr rune) { t.Text = t.Text + string(chr) - t.Draw(ui) + t.draw(ui) termbox.Flush() } diff --git a/uiterm/textview.go b/uiterm/textview.go index cc80fd4..1d0666b 100644 --- a/uiterm/textview.go +++ b/uiterm/textview.go @@ -16,10 +16,10 @@ type Textview struct { x0, y0, x1, y1 int } -func (t *Textview) SetActive(ui *Ui, active bool) { +func (t *Textview) setActive(ui *Ui, active bool) { } -func (t *Textview) SetBounds(ui *Ui, x0, y0, x1, y1 int) { +func (t *Textview) setBounds(ui *Ui, x0, y0, x1, y1 int) { t.x0 = x0 t.y0 = y0 t.x1 = x1 @@ -96,7 +96,7 @@ func (t *Textview) Clear() { t.parsedLines = nil } -func (t *Textview) Draw(ui *Ui) { +func (t *Textview) draw(ui *Ui) { var reader *strings.Reader line := len(t.parsedLines) - 1 - t.CurrentLine if line < 0 { @@ -134,8 +134,8 @@ func (t *Textview) Draw(ui *Ui) { } } -func (t *Textview) KeyEvent(ui *Ui, mod Modifier, key Key) { +func (t *Textview) keyEvent(ui *Ui, mod Modifier, key Key) { } -func (t *Textview) CharacterEvent(ui *Ui, chr rune) { +func (t *Textview) characterEvent(ui *Ui, chr rune) { } diff --git a/uiterm/tree.go b/uiterm/tree.go index 2c55f0e..1516bc9 100644 --- a/uiterm/tree.go +++ b/uiterm/tree.go @@ -42,7 +42,7 @@ func bounded(i, lower, upper int) int { return i } -func (t *Tree) SetBounds(ui *Ui, x0, y0, x1, y1 int) { +func (t *Tree) setBounds(ui *Ui, x0, y0, x1, y1 int) { t.x0 = x0 t.y0 = y0 t.x1 = x1 @@ -85,7 +85,7 @@ func (t *Tree) rebuild_rec(parent TreeItem, level int) []renderedTreeItem { return lines } -func (t *Tree) Draw(ui *Ui) { +func (t *Tree) draw(ui *Ui) { if t.lines == nil { t.Rebuild() } @@ -118,11 +118,11 @@ func (t *Tree) Draw(ui *Ui) { } } -func (t *Tree) SetActive(ui *Ui, active bool) { +func (t *Tree) setActive(ui *Ui, active bool) { t.active = active } -func (t *Tree) KeyEvent(ui *Ui, mod Modifier, key Key) { +func (t *Tree) keyEvent(ui *Ui, mod Modifier, key Key) { switch key { case KeyArrowUp: t.activeLine = bounded(t.activeLine-1, 0, len(t.lines)-1) @@ -136,5 +136,5 @@ func (t *Tree) KeyEvent(ui *Ui, mod Modifier, key Key) { ui.Refresh() } -func (t *Tree) CharacterEvent(ui *Ui, ch rune) { +func (t *Tree) characterEvent(ui *Ui, ch rune) { } diff --git a/uiterm/ui.go b/uiterm/ui.go index 9a47132..bb4d10b 100644 --- a/uiterm/ui.go +++ b/uiterm/ui.go @@ -52,7 +52,7 @@ func (ui *Ui) Refresh() { termbox.Clear(termbox.Attribute(ui.fg), termbox.Attribute(ui.bg)) termbox.HideCursor() for _, element := range ui.elements { - element.View.Draw(ui) + element.View.draw(ui) } termbox.Flush() } @@ -65,11 +65,11 @@ func (ui *Ui) Active() View { func (ui *Ui) SetActive(name string) { element, _ := ui.elements[name] if ui.activeElement != nil { - ui.activeElement.View.SetActive(ui, false) + ui.activeElement.View.setActive(ui, false) } ui.activeElement = element if element != nil { - element.View.SetActive(ui, true) + element.View.setActive(ui, true) } ui.Refresh() } @@ -123,7 +123,7 @@ func (ui *Ui) Run() error { func (ui *Ui) onCharacterEvent(ch rune) { if ui.activeElement != nil { - ui.activeElement.View.CharacterEvent(ui, ch) + ui.activeElement.View.characterEvent(ui, ch) } } @@ -134,7 +134,7 @@ func (ui *Ui) onKeyEvent(mod Modifier, key Key) { } } if ui.activeElement != nil { - ui.activeElement.View.KeyEvent(ui, mod, key) + ui.activeElement.View.keyEvent(ui, mod, key) } } @@ -154,7 +154,7 @@ func (ui *Ui) SetView(name string, x0, y0, x1, y1 int, view View) { View: view, } } - view.SetBounds(ui, x0, y0, x1, y1) + view.setBounds(ui, x0, y0, x1, y1) } func (ui *Ui) View(name string) View { diff --git a/uiterm/view.go b/uiterm/view.go index 61e9070..c33d1a6 100644 --- a/uiterm/view.go +++ b/uiterm/view.go @@ -1,9 +1,9 @@ package uiterm type View interface { - SetBounds(ui *Ui, x0, y0, x1, y1 int) - Draw(ui *Ui) - SetActive(ui *Ui, active bool) - KeyEvent(ui *Ui, mod Modifier, key Key) - CharacterEvent(ui *Ui, ch rune) + setActive(ui *Ui, active bool) + setBounds(ui *Ui, x0, y0, x1, y1 int) + draw(ui *Ui) + keyEvent(ui *Ui, mod Modifier, key Key) + characterEvent(ui *Ui, ch rune) } -- 2.39.2