jcarr
/
new-gui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use the standard golang 'image/color' struct 

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2019-05-21 15:17:50 -07:00
parent c3ba0117df
commit 0826a04593
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
table.go
View File

@ -3,6 +3,8 @@
package gui package gui
import "log" import "log"
import "image/color"
import "github.com/andlabs/ui" import "github.com/andlabs/ui"
import _ "github.com/andlabs/ui/winmanifest" import _ "github.com/andlabs/ui/winmanifest"
@ -32,7 +34,8 @@ type HumanCellData struct {
// Text ui.TableString // Text ui.TableString
Text string Text string
TextID int TextID int
Color ui.TableColor // Color ui.TableColor
Color color.RGBA
ColorID int ColorID int
} }

7
tableCallbacks.go
View File

@ -8,6 +8,7 @@ package gui
import "log" import "log"
import "fmt" import "fmt"
import "image/color"
import "github.com/andlabs/ui" import "github.com/andlabs/ui"
import _ "github.com/andlabs/ui/winmanifest" import _ "github.com/andlabs/ui/winmanifest"
@ -23,6 +24,10 @@ func (mh *TableData) ColumnTypes(m *ui.TableModel) []ui.TableValue {
return mh.generatedColumnTypes return mh.generatedColumnTypes
} }
func libuiColorToGOlangColor(rgba color.RGBA) ui.TableColor {
return ui.TableColor{float64(rgba.R) / 256, float64(rgba.G) / 256, float64(rgba.B) / 256, float64(rgba.A) / 256}
}
// TODO: Figure out why this is being called 1000 times a second (10 times for each row & column) // TODO: Figure out why this is being called 1000 times a second (10 times for each row & column)
// Nevermind this TODO. Who gives a shit. This is a really smart way to treat the OS toolkits // Nevermind this TODO. Who gives a shit. This is a really smart way to treat the OS toolkits
func (mh *TableData) CellValue(m *ui.TableModel, row, column int) ui.TableValue { func (mh *TableData) CellValue(m *ui.TableModel, row, column int) ui.TableValue {
@ -31,7 +36,7 @@ func (mh *TableData) CellValue(m *ui.TableModel, row, column int) ui.TableValue
return ui.TableString(mh.Rows[row].HumanData[humanID].Text) return ui.TableString(mh.Rows[row].HumanData[humanID].Text)
} }
if (column == mh.Human[humanID].ColorID) { if (column == mh.Human[humanID].ColorID) {
return mh.Rows[row].HumanData[humanID].Color return libuiColorToGOlangColor(mh.Rows[row].HumanData[humanID].Color)
} }
log.Println("CellValue() FAILURE") log.Println("CellValue() FAILURE")
log.Println("CellValue() FAILURE") log.Println("CellValue() FAILURE")