From c3ba0117dfaeb2ba74a3abc5146e6cb8fcfac8e1 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Tue, 21 May 2019 14:48:15 -0700 Subject: [PATCH] remove libui dependancy on ui.TableString type Use standard golang 'string' instead of requiring every external function that manipulates the UI actually need to import the libui toolkit. This hopefully seperates the GUI from the data the GUI displays. The libui code actually scans through the data and updates the cells based on what is stored in memory so this makes this seperation clean. Signed-off-by: Jeff Carr --- table.go | 3 ++- tableCallbacks.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/table.go b/table.go index f633cd8..6e6c091 100644 --- a/table.go +++ b/table.go @@ -29,7 +29,8 @@ type RowData struct { // hmm. will this stand the test of time? type HumanCellData struct { Name string // what kind of row is this? - Text ui.TableString + // Text ui.TableString + Text string TextID int Color ui.TableColor ColorID int diff --git a/tableCallbacks.go b/tableCallbacks.go index 94d174a..59fb8f6 100644 --- a/tableCallbacks.go +++ b/tableCallbacks.go @@ -28,7 +28,7 @@ func (mh *TableData) ColumnTypes(m *ui.TableModel) []ui.TableValue { func (mh *TableData) CellValue(m *ui.TableModel, row, column int) ui.TableValue { humanID := mh.Cells[column].HumanID if (column == mh.Human[humanID].TextID) { - return mh.Rows[row].HumanData[humanID].Text + return ui.TableString(mh.Rows[row].HumanData[humanID].Text) } if (column == mh.Human[humanID].ColorID) { return mh.Rows[row].HumanData[humanID].Color