-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ui: Add support for
ListBox component (#2)
* Inital listbox support for FLTK * Listbox -> ListBox * Add to "Hello Spot!" example * Add Cocoa implementation \o/ * Disable some logs
- Loading branch information
1 parent
ad1129d
commit 846ebba
Showing
7 changed files
with
309 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package ui | ||
|
|
||
| import ( | ||
| "github.com/roblillack/spot" | ||
| ) | ||
|
|
||
| type ListBox struct { | ||
| X int | ||
| Y int | ||
| Width int | ||
| Height int | ||
| Values []string | ||
| Multiselect bool | ||
| Selection []int | ||
| OnSelect func([]int) | ||
| ref nativeTypeListBox | ||
| } | ||
|
|
||
| var _ spot.Component = &ListBox{} | ||
| var _ spot.Control = &ListBox{} | ||
|
|
||
| func (c *ListBox) Render(ctx *spot.RenderContext) spot.Component { | ||
| return c | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| //go:build !fltk && (darwin || cocoa) | ||
|
|
||
| package ui | ||
|
|
||
| import ( | ||
| "slices" | ||
|
|
||
| "github.com/roblillack/gocoa" | ||
| "github.com/roblillack/spot" | ||
| ) | ||
|
|
||
| type nativeTypeListBox = *gocoa.TableView | ||
|
|
||
| func (c *ListBox) getSelection() []int { | ||
| if c.ref == nil { | ||
| return nil | ||
| } | ||
|
|
||
| if !c.Multiselect { | ||
| for i := 0; i < c.ref.NumberOfRows(); i++ { | ||
| if c.ref.IsRowSelected(i) { | ||
| return []int{i} | ||
| } | ||
| } | ||
|
|
||
| return []int{} | ||
| } | ||
|
|
||
| var selection []int | ||
| for i := 0; i < c.ref.NumberOfRows(); i++ { | ||
| if c.ref.IsRowSelected(i) { | ||
| selection = append(selection, i) | ||
| } | ||
| } | ||
|
|
||
| return selection | ||
| } | ||
|
|
||
| func (c *ListBox) setValues(values []string) { | ||
| c.Values = values | ||
|
|
||
| if c.ref == nil { | ||
| return | ||
| } | ||
|
|
||
| c.ref.Clear() | ||
| for _, v := range values { | ||
| c.ref.Add(v) | ||
| } | ||
| } | ||
|
|
||
| func (c *ListBox) setSelection(selection []int) { | ||
| c.Selection = selection | ||
|
|
||
| if c.ref == nil { | ||
| return | ||
| } | ||
|
|
||
| c.ref.DeselectAll() | ||
|
|
||
| for _, i := range selection { | ||
| c.ref.SelectRowIndex(i) | ||
| c.ref.ScrollRowToVisible(i) | ||
| } | ||
| } | ||
|
|
||
| func (c *ListBox) Update(nextComponent spot.Control) bool { | ||
| next, ok := nextComponent.(*ListBox) | ||
| if !ok { | ||
| return false | ||
| } | ||
|
|
||
| if c.ref == nil { | ||
| return false | ||
| } | ||
|
|
||
| if !slices.Equal(c.Values, next.Values) { | ||
| c.setValues(next.Values) | ||
| } | ||
|
|
||
| if !slices.Equal(c.Selection, next.Selection) { | ||
| c.setSelection(next.Selection) | ||
| } | ||
|
|
||
| c.OnSelect = next.OnSelect | ||
| c.ref.OnSelectionDidChange(c.OnSelect) | ||
|
|
||
| if c.Multiselect != next.Multiselect { | ||
| c.Multiselect = next.Multiselect | ||
| c.ref.SetAllowsMultipleSelection(c.Multiselect) | ||
| } | ||
|
|
||
| return true | ||
| } | ||
|
|
||
| func (c *ListBox) Mount(parent spot.Control) any { | ||
| if c.ref != nil { | ||
| return c.ref | ||
| } | ||
|
|
||
| c.ref = gocoa.NewTableView(c.X, c.Y, c.Width, c.Height) | ||
| c.ref.SetAllowsMultipleSelection(c.Multiselect) | ||
|
|
||
| c.setValues(c.Values) | ||
| c.setSelection(c.Selection) | ||
| c.ref.OnSelectionDidChange(c.OnSelect) | ||
|
|
||
| if window, ok := parent.(*Window); ok && window != nil && window.ref != nil { | ||
| window.ref.AddTableView(c.ref) | ||
| } | ||
|
|
||
| return c.ref | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| //go:build !cocoa && (fltk || !darwin) | ||
|
|
||
| package ui | ||
|
|
||
| import ( | ||
| "slices" | ||
|
|
||
| goFltk "github.com/pwiecz/go-fltk" | ||
| "github.com/roblillack/spot" | ||
| ) | ||
|
|
||
| type nativeTypeListBox = *goFltk.Browser | ||
|
|
||
| func (c *ListBox) getSelection() []int { | ||
| if c.ref == nil { | ||
| return nil | ||
| } | ||
|
|
||
| if !c.Multiselect { | ||
| if c.ref.Value() == 0 { | ||
| return nil | ||
| } | ||
|
|
||
| return []int{c.ref.Value() - 1} | ||
| } | ||
|
|
||
| var selection []int | ||
| for i := 0; i < c.ref.Size(); i++ { | ||
| if c.ref.IsSelected(i + 1) { | ||
| selection = append(selection, i) | ||
| } | ||
| } | ||
|
|
||
| return selection | ||
| } | ||
|
|
||
| func (c *ListBox) setValues(values []string) { | ||
| c.Values = values | ||
|
|
||
| if c.ref == nil { | ||
| return | ||
| } | ||
|
|
||
| c.ref.Clear() | ||
| for _, v := range values { | ||
| c.ref.Add(v) | ||
| } | ||
| } | ||
|
|
||
| func (c *ListBox) setSelection(selection []int) { | ||
| c.Selection = selection | ||
|
|
||
| if c.ref == nil { | ||
| return | ||
| } | ||
|
|
||
| for i := 0; i < c.ref.Size(); i++ { | ||
| c.ref.SetSelected(i+1, false) | ||
| } | ||
|
|
||
| for _, i := range selection { | ||
| c.ref.SetSelected(i+1, true) | ||
| } | ||
| } | ||
|
|
||
| func (c *ListBox) callback() { | ||
| if c.ref == nil { | ||
| return | ||
| } | ||
|
|
||
| oldSelection := c.Selection | ||
|
|
||
| c.Selection = c.getSelection() | ||
| // fmt.Printf("LISTBOX[%p] callback, multi: %v, selection: %v\n", c, c.Multiselect, c.Selection) | ||
|
|
||
| if !c.Multiselect { | ||
| c.setSelection(c.Selection) | ||
| } | ||
|
|
||
| if c.OnSelect != nil && !slices.Equal(oldSelection, c.Selection) { | ||
| c.OnSelect(c.Selection) | ||
| } | ||
| } | ||
|
|
||
| func (c *ListBox) Update(nextComponent spot.Control) bool { | ||
| // fmt.Printf("LISTBOX[%p] Update\n", c) | ||
| next, ok := nextComponent.(*ListBox) | ||
| if !ok { | ||
| return false | ||
| } | ||
|
|
||
| if c.ref == nil { | ||
| return false | ||
| } | ||
|
|
||
| if !slices.Equal(c.Values, next.Values) { | ||
| c.setValues(next.Values) | ||
| } | ||
|
|
||
| if !slices.Equal(c.Selection, next.Selection) { | ||
| c.setSelection(next.Selection) | ||
| } | ||
|
|
||
| c.OnSelect = next.OnSelect | ||
|
|
||
| if c.Multiselect != next.Multiselect { | ||
| c.Multiselect = next.Multiselect | ||
| if c.ref != nil { | ||
| parent := c.ref.Parent() | ||
| c.ref.Destroy() | ||
| c.ref = nil | ||
| c.Mount(nil) | ||
| parent.Add(c.ref) | ||
| } | ||
| } | ||
|
|
||
| return true | ||
| } | ||
|
|
||
| func (c *ListBox) Mount(parent spot.Control) any { | ||
| if c.ref != nil { | ||
| return c.ref | ||
| } | ||
|
|
||
| if c.Multiselect { | ||
| ref := goFltk.NewMultiBrowser(c.X, c.Y, c.Width, c.Height) | ||
| browser := ref.Browser | ||
| c.ref = &browser | ||
| } else { | ||
| ref := goFltk.NewSelectBrowser(c.X, c.Y, c.Width, c.Height) | ||
| browser := ref.Browser | ||
| c.ref = &browser | ||
| } | ||
| c.ref.SetCallback(c.callback) | ||
| c.setValues(c.Values) | ||
| c.setSelection(c.Selection) | ||
|
|
||
| if window, ok := parent.(*Window); ok && window != nil && window.ref != nil { | ||
| window.ref.Add(c.ref) | ||
| } | ||
|
|
||
| return c.ref | ||
| } |