tomo/tomo-old
tomo/tomo-old
Archived
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Themeing tweaks

Browse Source
This commit is contained in:
Sasha Koshka 2023-01-30 17:57:24 -05:00
parent 58c3b23a99
commit 6b19d66067
3 changed files with 54 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
theme/list.go
View File

@ -7,28 +7,38 @@ var listPattern = artist.NewMultiBordered (
artist.Stroke { artist.Stroke {
Weight: 1, Weight: 1,
Pattern: artist.Beveled { Pattern: artist.Beveled {
artist.NewUniform(hex(0x383C3AFF)), uhex(0x383C3AFF),
artist.NewUniform(hex(0x999C99FF)), uhex(0x999C99FF),
}, },
}, },
artist.Stroke { Pattern: artist.NewUniform(hex(0x999C99FF)) }) artist.Stroke { Pattern: uhex(0x999C99FF) })
var selectedListPattern = artist.NewMultiBordered ( var focusedListPattern = artist.NewMultiBordered (
artist.Stroke { Weight: 1, Pattern: strokePattern }, artist.Stroke { Weight: 1, Pattern: strokePattern },
artist.Stroke { Weight: 1, Pattern: accentPattern }, artist.Stroke { Weight: 1, Pattern: accentPattern },
artist.Stroke { Pattern: artist.NewUniform(hex(0x999C99FF)) }) artist.Stroke { Pattern: uhex(0x999C99FF) })
// TODO: make these better, making use of the padded pattern. also, create var listEntryPattern = artist.Padded {
// selected variations for both of these. Stroke: uhex(0x383C3AFF),
Fill: uhex(0x999C99FF),
Sides: []int { 0, 0, 0, 1 },
}
var listEntryPattern = artist.NewMultiBordered ( var onListEntryPattern = artist.Padded {
artist.Stroke { Pattern: artist.NewUniform(hex(0x999C99FF)) }) Stroke: uhex(0x383C3AFF),
Fill: uhex(0x6e8079FF),
Sides: []int { 0, 0, 0, 1 },
}
var onListEntryPattern = artist.NewMultiBordered ( var focusedListEntryPattern = artist.Padded {
artist.Stroke { Pattern: artist.NewUniform(hex(0x6e8079FF)) }) Stroke: accentPattern,
Fill: uhex(0x999C99FF),
Sides: []int { 0, 1, 0, 1 },
}
var selectedListEntryPattern = artist.NewMultiBordered ( var focusedOnListEntryPattern = artist.Padded {
artist.Stroke { Pattern: artist.NewUniform(hex(0x999C99FF)) }) Stroke: accentPattern,
Fill: uhex(0x6e8079FF),
Sides: []int { 0, 1, 0, 1 },
}
var selectedOnListEntryPattern = artist.NewMultiBordered (
artist.Stroke { Pattern: artist.NewUniform(hex(0x6e8079FF)) })

17
theme/patterns.go
View File

@ -134,27 +134,32 @@ func InputPattern (state PatternState) (pattern artist.Pattern, inset Inset) {
// ListPattern returns a background pattern for a list of things. // ListPattern returns a background pattern for a list of things.
func ListPattern (state PatternState) (pattern artist.Pattern, inset Inset) { func ListPattern (state PatternState) (pattern artist.Pattern, inset Inset) {
if state.Focused { if state.Focused {
return selectedListPattern, Inset { 4, 4, 4, 4 } pattern = focusedListPattern
inset = Inset { 2, 1, 2, 1 }
} else { } else {
return listPattern, Inset { 4, 4, 4, 4 } pattern = listPattern
inset = Inset { 2, 1, 1, 1 }
} }
return
} }
// ItemPattern returns a background pattern for a list item. // ItemPattern returns a background pattern for a list item.
func ItemPattern (state PatternState) (pattern artist.Pattern, inset Inset) { func ItemPattern (state PatternState) (pattern artist.Pattern, inset Inset) {
if state.Focused { if state.Focused {
if state.On { if state.On {
return selectedOnListEntryPattern, Inset { 4, 4, 4, 4 } pattern = focusedOnListEntryPattern
} else { } else {
return selectedListEntryPattern, Inset { 4, 4, 4, 4 } pattern = focusedListEntryPattern
} }
} else { } else {
if state.On { if state.On {
return onListEntryPattern, Inset { 4, 4, 4, 4 } pattern = onListEntryPattern
} else { } else {
return listEntryPattern, Inset { 4, 4, 4, 4 } pattern = listEntryPattern
} }
} }
inset = Inset { 4, 6, 4, 6 }
return
} }
// ButtonPattern returns a pattern to be displayed on buttons. // ButtonPattern returns a pattern to be displayed on buttons.

27
theme/theme.go
View File

@ -16,6 +16,10 @@ func hex (color uint32) (c color.RGBA) {
return return
} }
func uhex (color uint32) (pattern artist.Pattern) {
return artist.NewUniform(hex(color))
}
var accentPattern = artist.NewUniform(hex(0x408090FF)) var accentPattern = artist.NewUniform(hex(0x408090FF))
var backgroundPattern = artist.NewUniform(color.Gray16 { 0xAAAA }) var backgroundPattern = artist.NewUniform(color.Gray16 { 0xAAAA })
var foregroundPattern = artist.NewUniform(color.Gray16 { 0x0000 }) var foregroundPattern = artist.NewUniform(color.Gray16 { 0x0000 })
@ -42,15 +46,20 @@ var texturedSunkenPattern = artist.NewMultiBordered (
artist.NewUniform(hex(0x97a09cFF)), artist.NewUniform(hex(0x97a09cFF)),
}, },
}, },
artist.Stroke { Pattern: artist.Striped { // artist.Stroke { Pattern: artist.Striped {
First: artist.Stroke { // First: artist.Stroke {
Weight: 2, // Weight: 2,
Pattern: artist.NewUniform(hex(0x97a09cFF)), // Pattern: artist.NewUniform(hex(0x97a09cFF)),
}, // },
Second: artist.Stroke { // Second: artist.Stroke {
Weight: 1, // Weight: 1,
Pattern: artist.NewUniform(hex(0x6e8079FF)), // Pattern: artist.NewUniform(hex(0x6e8079FF)),
}, // },
// }})
artist.Stroke { Pattern: artist.Noisy {
Low: artist.NewUniform(hex(0x97a09cFF)),
High: artist.NewUniform(hex(0x6e8079FF)),
}}) }})
var raisedPattern = artist.NewMultiBordered ( var raisedPattern = artist.NewMultiBordered (