go.mod

@@ -3,8 +3,8 @@ module git.tebibyte.media/tomo/nasin
 go 1.20
 
 require (
-	git.tebibyte.media/tomo/backend v0.4.1
+	git.tebibyte.media/tomo/backend v0.4.0
-	git.tebibyte.media/tomo/objects v0.19.0
+	git.tebibyte.media/tomo/objects v0.18.1
 	git.tebibyte.media/tomo/tomo v0.38.0
 	git.tebibyte.media/tomo/xdg v0.1.0
 	golang.org/x/image v0.11.0

go.sum

@@ -1,8 +1,8 @@
 git.tebibyte.media/sashakoshka/xgbkb v1.0.0/go.mod h1:pNcE6TRO93vHd6q42SdwLSTTj25L0Yzggz7yLe0JV6Q=
-git.tebibyte.media/tomo/backend v0.4.1 h1:rpkyTAfp/PE56aSqKNxtSN+D/aBSW8wjJ/vTtSgqQhE=
+git.tebibyte.media/tomo/backend v0.4.0 h1:Sm2DW1gLoco5IWa9L7JQSLa44KJ21zjLTBI7ipXE3WY=
-git.tebibyte.media/tomo/backend v0.4.1/go.mod h1:2G04zmKbzf5fA/xzsjoQRrN55BWZkB+vknFxd3ialZ0=
+git.tebibyte.media/tomo/backend v0.4.0/go.mod h1:2G04zmKbzf5fA/xzsjoQRrN55BWZkB+vknFxd3ialZ0=
-git.tebibyte.media/tomo/objects v0.19.0 h1:ibnAoPvkPTiuJGlqQDnoGVZBQiUT/GZo1qqvDDUCK4w=
+git.tebibyte.media/tomo/objects v0.18.1 h1:FfVbudj67H+k5mle1GlyfxA90dI/WspFX2rBRYnWCLw=
-git.tebibyte.media/tomo/objects v0.19.0/go.mod h1:GP5BZ6lc2F2D0OxERfr9r46PIk7jFlpq2/BWOpoQDqc=
+git.tebibyte.media/tomo/objects v0.18.1/go.mod h1:GP5BZ6lc2F2D0OxERfr9r46PIk7jFlpq2/BWOpoQDqc=
 git.tebibyte.media/tomo/tomo v0.38.0 h1:K5TP67RxnszudeNfmGZiU5cFTRjFueXiI3NCsgw+05U=
 git.tebibyte.media/tomo/tomo v0.38.0/go.mod h1:C9EzepS9wjkTJjnZaPBh22YvVPyA4hbBAJVU20Rdmps=
 git.tebibyte.media/tomo/typeset v0.7.1 h1:aZrsHwCG5ZB4f5CruRFsxLv5ezJUCFUFsQJJso2sXQ8=

internal/style/fallback/style.go

@@ -20,7 +20,6 @@ var colorOutline               = color.Black
 var colorCalendarWeekdayHeader = color.RGBA { R: 194, G: 162, B: 132, A: 255 }
 var colorCalendarWeekend       = color.RGBA { R: 165, G: 185, B: 120, A: 255 }
 var colorCalendarDay           = color.RGBA { R: 194, G: 189, B: 132, A: 255 }
-var colorInactive              = color.RGBA { R: 131, G: 147, B: 134, A: 255 }
 
 var outline = tomo.Border {
 	Width: tomo.I(1),
@@ -32,12 +31,11 @@ var outline = tomo.Border {
 	},
 }
 
-var borderColorOutline  = [4]color.Color { colorOutline,     colorOutline,   colorOutline,   colorOutline     }
+var borderColorEngraved = [4]color.Color { colorShadow,      colorHighlight, colorHighlight, colorShadow }
-var borderColorEngraved = [4]color.Color { colorShadow,      colorHighlight, colorHighlight, colorShadow      }
+var borderColorLifted   = [4]color.Color { colorHighlight,   colorShadow,    colorShadow,    colorHighlight }
-var borderColorLifted   = [4]color.Color { colorHighlight,   colorShadow,    colorShadow,    colorHighlight   }
 var borderColorInput    = [4]color.Color { colorInputShadow, colorInput,     colorInput,     colorInputShadow }
-var borderColorFocused  = [4]color.Color { colorFocus,       colorFocus,     colorFocus,     colorFocus       }
+var borderColorFocused  = [4]color.Color { colorFocus,       colorFocus,     colorFocus,     colorFocus }
-var borderColorShade    = [4]color.Color { colorShade,       colorShade,     colorShade,     colorShade       }
+var borderColorShade    = [4]color.Color { colorShade,       colorShade,     colorShade,     colorShade }     
 
 var rules = []style.Rule {
 	// *.*[*]
@@ -279,6 +277,14 @@ var rules = []style.Rule {
 		),
 	},
 
+	// *.LabelCheckbox[*]
+	style.Rule {
+		Role: tomo.R("", "LabelCheckbox", ""),
+		Default: style.AS (
+			style.AttrGap { X: 8, Y: 8 },
+		),
+	},
+
 	// *.MenuItem[*]
 	style.Rule {
 		Role: tomo.R("", "MenuItem", ""),
@@ -395,164 +401,4 @@ var rules = []style.Rule {
 			style.AttrColor { Color: colorCalendarWeekend },
 		),
 	},
-	
-	// *.TabbedContainer[*]
-	style.Rule {
-		Role: tomo.R("", "TabbedContainer", ""),
-		Default: style.AS (
-			style.AttrGap { },
-		),
-	},
-	
-	// *.TabRow[*]
-	style.Rule {
-		Role: tomo.R("", "TabRow", ""),
-		Default: style.AS (
-			style.AttrBorder {
-				tomo.Border {
-					Width: tomo.I(1, 1, 0, 1),
-					Color: borderColorOutline,
-				},
-				tomo.Border {
-					Width: tomo.I(1, 0, 0, 1),
-					Color: borderColorEngraved,
-				},
-			},
-			style.AttrGap { X: 0, Y: 0 },
-			style.AttrColor { Color: colorGutter },
-			style.AttrPadding(tomo.I(1, 0, 0, 0)),
-		),
-	},
-	
-	// *.TabSpacer[left]
-	style.Rule {
-		Role: tomo.R("", "TabSpacer", "left"),
-		Default: style.AS (
-			style.AttrBorder {
-				tomo.Border {
-					Width: tomo.I(0, 0, 1, 0),
-					Color: borderColorEngraved,
-				},
-				tomo.Border {
-					Width: tomo.I(0, 0, 1, 0),
-					Color: borderColorOutline,
-				},
-			},
-			style.AttrMinimumSize { X: 1 },
-		),
-	},
-	
-	// *.TabSpacer[right]
-	style.Rule {
-		Role: tomo.R("", "TabSpacer", "right"),
-		Default: style.AS (
-			style.AttrBorder {
-				tomo.Border {
-					Width: tomo.I(1, 0, 0, 0),
-					Color: [4]color.Color {
-						colorGutter, colorGutter,
-						colorGutter, colorGutter,
-					},
-				},
-				tomo.Border {
-					Width: tomo.I(0, 0, 1, 0),
-					Color: borderColorEngraved,
-				},
-				tomo.Border {
-					Width: tomo.I(0, 0, 1, 1),
-					Color: borderColorOutline,
-				},
-				tomo.Border {
-					Width: tomo.I(0, 0, 0, 1),
-					Color: borderColorShade,
-				},
-			},
-			style.AttrMinimumSize { X: 3 },
-		),
-	},
-	
-	// *.Tab[*]
-	style.Rule {
-		Role: tomo.R("", "Tab", ""),
-		Default: style.AS (
-			style.AttrBorder {
-				tomo.Border {
-					Width: tomo.I(1, 0, 0, 0),
-					Color: [4]color.Color {
-						colorGutter, colorGutter,
-						colorGutter, colorGutter,
-					},
-				},
-				tomo.Border {
-					Width: tomo.I(0, 0, 1, 0),
-					Color: borderColorEngraved,
-				},
-				tomo.Border {
-					Width: tomo.I(1, 0, 1, 1),
-					Color: borderColorOutline,
-				},
-				tomo.Border {
-					Width: tomo.I(1, 1, 0, 1),
-					Color: borderColorLifted,
-				},
-			},
-			style.AttrPadding(tomo.I(4, 8, 4, 8)),
-			style.AttrColor { Color: tomo.ColorRaised },
-		),
-	},
-	
-	// *.Tab[active]
-	style.Rule {
-		Role: tomo.R("", "Tab", "active"),
-		Default: style.AS (
-			style.AttrBorder {
-				tomo.Border {
-					Width: tomo.I(1, 0, 0, 1),
-					Color: borderColorOutline,
-				},
-				tomo.Border {
-					Width: tomo.I(1, 1, 0, 1),
-					Color: borderColorLifted,
-				},
-			},
-			style.AttrPadding(tomo.I(4, 8, 4, 8)),
-			style.AttrColor { Color: tomo.ColorBackground },
-		),
-	},
-
-	// *.Swatch[*]
-	style.Rule {
-		Role: tomo.R("", "Swatch", ""),
-		Default: style.AS (
-			style.AttrBorder {
-				outline,
-			},
-			style.AttrMinimumSize { X: 19, Y: 19 },
-		),
-		Focused: style.AS (
-			style.AttrBorder {
-				outline,
-				tomo.Border {
-					Width: tomo.I(1),
-					Color: borderColorFocused,
-				},
-			},
-		),
-	},
-
-	// *.ColorPickerMap[*]
-	style.Rule {
-		Role: tomo.R("", "ColorPickerMap", ""),
-		Default: style.AS (
-			style.AttrBorder {
-				outline,
-				tomo.Border {
-					Width: tomo.I(1, 0, 0, 1),
-					Color: borderColorEngraved,
-				},
-			},
-			style.AttrColor { Color: tomo.ColorSunken },
-			style.AttrMinimumSize { X: 128, Y: 128 },
-		),
-	},
 }