schobers/zntg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed palette (added PrimaryDark color and changed PrimaryHighlight and PrimaryLight colors).

Browse Source
This commit is contained in:
Sander Schobers 2019-04-11 20:02:15 +02:00
parent 3390d46f34
commit 28af8aba06
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/button.go
View File

@ -73,10 +73,10 @@ func (b *Button) fillColor(p *Palette) color.Color {
if b.over { if b.over {
switch b.Type { switch b.Type {
case ButtonTypeContained: case ButtonTypeContained:
return p.PrimaryHighlight return p.PrimaryLight
case ButtonTypeIcon: case ButtonTypeIcon:
default: default:
return p.PrimaryLight return p.PrimaryHighlight
} }
} }
switch b.Type { switch b.Type {

2
ui/scrollbar.go
View File

@ -85,7 +85,7 @@ func (h *ScrollbarHandle) Render(ctx Context) {
p := ctx.Style().Palette p := ctx.Style().Palette
fill := p.Primary fill := p.Primary
if h.over { if h.over {
fill = p.PrimaryHighlight fill = p.PrimaryLight
} }
ctx.Renderer().FillRectangle(h.bounds.Inset(1), fill) ctx.Renderer().FillRectangle(h.bounds.Inset(1), fill)
} }

9
ui/style.go
View File

@ -21,7 +21,9 @@ type Palette struct {
Background color.Color Background color.Color
// Primary is used as a the main contrast color. // Primary is used as a the main contrast color.
Primary color.Color Primary color.Color
// PrimaryHighlight is a highlighted version of the main contrast color. // PrimaryDark is a foreground version of the main contrast color.
PrimaryDark color.Color
// PrimaryHighlight is a light version of the main contrast color.
PrimaryHighlight color.Color PrimaryHighlight color.Color
// PrimaryLight is a background version of the main contrast color. // PrimaryLight is a background version of the main contrast color.
PrimaryLight color.Color PrimaryLight color.Color
@ -65,8 +67,9 @@ func DefaultPalette() *Palette {
defaultPalette = &Palette{ defaultPalette = &Palette{
Background: color.White, Background: color.White,
Primary: RGBA(0x3F, 0x51, 0xB5, 0xFF), Primary: RGBA(0x3F, 0x51, 0xB5, 0xFF),
PrimaryHighlight: RGBA(0x5C, 0x6B, 0xC0, 0xFF), PrimaryDark: RGBA(0x00, 0x28, 0x84, 0xFF),
PrimaryLight: RGBA(0xE8, 0xEA, 0xF6, 0xFF), PrimaryHighlight: RGBA(0xE8, 0xEA, 0xF6, 0xFF),
PrimaryLight: RGBA(0x75, 0x7C, 0xE8, 0xFF),
ShadedBackground: RGBA(0xFA, 0xFA, 0xFA, 0xFF), ShadedBackground: RGBA(0xFA, 0xFA, 0xFA, 0xFF),
Text: color.Black, Text: color.Black,
TextDisabled: RGBA(0xBD, 0xBD, 0xBD, 0xFF), TextDisabled: RGBA(0xBD, 0xBD, 0xBD, 0xFF),

2
ui/textbox.go
View File

@ -233,7 +233,7 @@ func (b *TextBox) Render(ctx Context) {
renderer.Clear(color.Transparent) renderer.Clear(color.Transparent)
if b.Selection.Start != b.Selection.End { if b.Selection.Start != b.Selection.End {
left, right := renderer.Font(f).WidthOf(b.Text[:b.Selection.Start]), renderer.Font(f).WidthOf(b.Text[:b.Selection.End]) left, right := renderer.Font(f).WidthOf(b.Text[:b.Selection.Start]), renderer.Font(f).WidthOf(b.Text[:b.Selection.End])
renderer.FillRectangle(geom.RectF32(left, 0, right, size.Y), style.Palette.PrimaryLight) renderer.FillRectangle(geom.RectF32(left, 0, right, size.Y), style.Palette.PrimaryHighlight)
} }
renderer.Text(geom.ZeroPtF32, f, c, b.Text) renderer.Text(geom.ZeroPtF32, f, c, b.Text)
const interval = 500 * time.Millisecond const interval = 500 * time.Millisecond