From b9be483869cfc40d1e069e9f64e7a7ddc13e8e23 Mon Sep 17 00:00:00 2001 From: Sasha Koshka Date: Tue, 17 Jan 2023 18:12:04 -0500 Subject: [PATCH] Tweaked the sunken pattern --- theme/button.go | 16 +++++++++++++++- theme/theme.go | 6 +++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/theme/button.go b/theme/button.go index 6601e4b..6e03728 100644 --- a/theme/button.go +++ b/theme/button.go @@ -33,6 +33,16 @@ var pressedButtonPattern = artist.NewMultiBorder ( }, }, artist.Border { Stroke: artist.NewUniform(hex(0x8D9894FF)) }) +var pressedSelectedButtonPattern = artist.NewMultiBorder ( + artist.Border { Weight: 1, Stroke: strokePattern }, + artist.Border { + Weight: 1, + Stroke: artist.Chiseled { + Highlight: artist.NewUniform(hex(0x4B5B59FF)), + Shadow: artist.NewUniform(hex(0x8D9894FF)), + }, + }, + artist.Border { Stroke: artist.NewUniform(hex(0x8D9894FF)) }) var disabledButtonPattern = artist.NewMultiBorder ( artist.Border { Weight: 1, Stroke: weakForegroundPattern }, artist.Border { Stroke: backgroundPattern }) @@ -40,7 +50,11 @@ var disabledButtonPattern = artist.NewMultiBorder ( func ButtonPattern (enabled, selected, pressed bool) (artist.Pattern) { if enabled { if pressed { - return pressedButtonPattern + if selected { + return pressedSelectedButtonPattern + } else { + return pressedButtonPattern + } } else { if selected { return selectedButtonPattern diff --git a/theme/theme.go b/theme/theme.go index 087cf1b..a16cfdc 100644 --- a/theme/theme.go +++ b/theme/theme.go @@ -28,11 +28,11 @@ var sunkenPattern = artist.NewMultiBorder ( artist.Border { Weight: 1, Stroke: artist.Chiseled { - Highlight: artist.NewUniform(hex(0x373C3AFF)), - Shadow: artist.NewUniform(hex(0xDBDBDBFF)), + Highlight: artist.NewUniform(hex(0x3b534eFF)), + Shadow: artist.NewUniform(hex(0x97a09cFF)), }, }, - artist.Border { Stroke: backgroundPattern }) + artist.Border { Stroke: artist.NewUniform(hex(0x97a09cFF)) }) func AccentPattern () (artist.Pattern) { return accentPattern } func BackgroundPattern () (artist.Pattern) { return backgroundPattern }