diff --git a/elements/basic/progressbar.go b/elements/basic/progressbar.go index 4bef1b0..6a89f1a 100644 --- a/elements/basic/progressbar.go +++ b/elements/basic/progressbar.go @@ -43,7 +43,7 @@ func (element *ProgressBar) draw () { artist.FillRectangle ( element.core, - theme.SunkenPattern(), + theme.SunkenPattern(false), bounds) meterBounds := image.Rect ( bounds.Min.X + 2, bounds.Min.Y + 2, diff --git a/elements/fun/clock.go b/elements/fun/clock.go index 27f613f..526fecc 100644 --- a/elements/fun/clock.go +++ b/elements/fun/clock.go @@ -43,7 +43,7 @@ func (element *AnalogClock) draw () { artist.FillRectangle ( element, - theme.SunkenPattern(), + theme.SunkenPattern(false), bounds) for hour := 0; hour < 12; hour ++ { diff --git a/theme/theme.go b/theme/theme.go index 923b5e2..14d4453 100644 --- a/theme/theme.go +++ b/theme/theme.go @@ -32,7 +32,17 @@ var sunkenPattern = artist.NewMultiBordered ( artist.NewUniform(hex(0x97a09cFF)), }, }, - // artist.Stroke { Pattern: artist.NewUniform(hex(0x97a09cFF)) }, + artist.Stroke { Pattern: artist.NewUniform(hex(0x97a09cFF)) }) + +var texturedSunkenPattern = artist.NewMultiBordered ( + artist.Stroke { Weight: 1, Pattern: strokePattern }, + artist.Stroke { + Weight: 1, + Pattern: artist.Beveled { + artist.NewUniform(hex(0x3b534eFF)), + artist.NewUniform(hex(0x97a09cFF)), + }, + }, artist.Stroke { Pattern: artist.Striped { First: artist.Stroke { Weight: 2, @@ -73,7 +83,16 @@ var deadPattern = artist.NewMultiBordered ( func AccentPattern () (artist.Pattern) { return accentPattern } func BackgroundPattern () (artist.Pattern) { return backgroundPattern } -func SunkenPattern () (artist.Pattern) { return sunkenPattern } +func DeadPattern () (artist.Pattern) { return deadPattern } + +func SunkenPattern (textured bool) (artist.Pattern) { + if textured { + return texturedSunkenPattern + } else { + return sunkenPattern + } +} + func RaisedPattern (selected bool) (artist.Pattern) { if selected { return selectedRaisedPattern @@ -81,7 +100,7 @@ func RaisedPattern (selected bool) (artist.Pattern) { return raisedPattern } } -func DeadPattern () (artist.Pattern) { return deadPattern } + func ForegroundPattern (enabled bool) (artist.Pattern) { if enabled { return foregroundPattern