From dfd566b23d4bb51019326efd32d60de9cc2c4c9c Mon Sep 17 00:00:00 2001 From: Sasha Koshka Date: Tue, 7 May 2024 20:22:53 -0400 Subject: [PATCH] Include new objects in Wintergreen theme --- internal/theme/default/style.go | 54 ++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/internal/theme/default/style.go b/internal/theme/default/style.go index 12336c4..7015127 100644 --- a/internal/theme/default/style.go +++ b/internal/theme/default/style.go @@ -109,24 +109,7 @@ var rules = []dataTheme.Rule { dataTheme.Rule { Role: theme.R("", "NumberInput", ""), Default: dataTheme.AS ( - dataTheme.AttrBorder { - outline, - tomo.Border { - Width: tomo.I(1), - Color: borderColorInput, - }, - }, - dataTheme.AttrColor { Color: colorInput }, - dataTheme.AttrPadding(tomo.I(5, 4, 4, 5)), - ), - Focused: dataTheme.AS ( - dataTheme.AttrBorder { - outline, - tomo.Border { - Width: tomo.I(1), - Color: borderColorFocused, - }, - }, + dataTheme.AttrGap { }, ), }, @@ -213,4 +196,39 @@ var rules = []dataTheme.Rule { dataTheme.AttrMinimumSize { X: 12, Y: 12, }, ), }, + + // *.Checkbox[*] + dataTheme.Rule { + Role: theme.R("", "Checkbox", ""), + Default: dataTheme.AS ( + dataTheme.AttrBorder { + outline, + tomo.Border { + Width: tomo.I(1, 0, 0, 1), + Color: borderColorEngraved, + }, + }, + dataTheme.AttrColor { Color: theme.ColorSunken }, + dataTheme.AttrPadding(tomo.I(0, 1, 1, 0)), + dataTheme.AttrMinimumSize { X: 19, Y: 19 }, + ), + Focused: dataTheme.AS ( + dataTheme.AttrBorder { + outline, + tomo.Border { + Width: tomo.I(1), + Color: borderColorFocused, + }, + }, + dataTheme.AttrPadding(tomo.I(0)), + ), + }, + + // *.LabelCheckbox[*] + dataTheme.Rule { + Role: theme.R("", "LabelCheckbox", ""), + Default: dataTheme.AS ( + dataTheme.AttrGap { X: 8, Y: 8 }, + ), + }, }