Aluminum has complete styling for tabs

Archival dirs are pointless, we have git for a reason

application.go

@@ -15,8 +15,9 @@ type Application interface {
 	// Describe returns a description of the application.
 	Describe () ApplicationDescription
 
-	// Init performs the initial setup of the application.
-	Init () error
+	// Init performs the initial setup of the application. This behavior
+	// should return a window if it creates one.
+	Init () (tomo.Window, error)
 }
 
 // ApplicationURLOpener is an application that can open a URL.
@@ -29,12 +30,15 @@ type ApplicationURLOpener interface {
 	//
 	// Applications should support the file:// scheme at the very least, and
 	// should also support others like http:// and https:// if possible.
-	OpenURL (*url.URL) error
+	//
+	// This behavior should return a window if it creates one.
+	OpenURL (*url.URL) (tomo.Window, error)
 
 	// OpenNone is called when the application is launched without any URLs
 	// to open. The application may create some sort of default starting
-	// window, or call tomo.Stop().
-	OpenNone ()
+	// window, or do nothing. This behavior should return a window if it
+	// creates one.
+	OpenNone () (tomo.Window, error)
 }
 
 // ApplicationFlagAdder is an application that supports reading command line
@@ -148,14 +152,18 @@ func RunApplication (application Application) {
 	if err != nil { log.Fatalln("nasin: could not set icon set:", err) }
 	err = reg.SetFaceSet()
 	if err != nil { log.Fatalln("nasin: could not set face set:", err) }
-	err = application.Init()
+	window, err := application.Init()
 	if err != nil { log.Fatalln("nasin: could not run application:", err) }
+	manageWindow(window)
 
 	// open URLs
 	args := flag.Args()
 	applicationOpenUrls(application, args...)
-	err = backend.Run()
-	if err != nil { log.Fatalln("nasin: could not run application:", err) }
+
+	if windows > 0 {
+		err = backend.Run()
+		if err != nil { log.Fatalln("nasin: could not run application:", err) }
+	}
 }
 
 // NewApplicationWindow creates a window for an application. It will
@@ -173,44 +181,80 @@ func NewApplicationWindow (application Application, bounds image.Rectangle) (tom
 	return window, nil
 }
 
-func applicationOpenUrls (application Application, args ...string) {
-	if application, ok := application.(ApplicationURLOpener); ok {
-		if len(args) <= 0 {
-			application.OpenNone()
-		}
+var windows int
 
-		openedAny := false
-		for _, arg := range flag.Args() {
-			ur, err := url.Parse(arg)
-			if err != nil {
-				log.Fatalf (
-					"nasin: invalid URL %v: %v",
-					arg, err)
-			}
-			if ur.Scheme == "" {
-				ur.Scheme = "file"
-			}
-			err = application.OpenURL(ur)
-			if err != nil {
-				dialog, err := objects.NewDialogOk (
-					objects.DialogError, nil,
-					"Could Not Open URL",
-					fmt.Sprintf (
-						"Could not open %v: %v",
-						arg, err),
-					func () {
-						if !openedAny {
-							application.OpenNone()
-						}
-					})
-				if err != nil { log.Fatal(err) }
-				dialog.SetVisible(true)
-			}
+func manageWindow (window tomo.Window) {
+	if window == nil { return }
+	windows ++
+	window.OnClose(func () {
+		windows --
+		if windows < 1 {
+			tomo.Stop()
 		}
-	} else {
+	})
+}
+
+func errorPopupf (title, format string, v ...any) func (func ()) {
+	return func (callback func ()) {
+		dialog, err := objects.NewDialogOk (
+			objects.DialogError, nil,
+			title,
+			fmt.Sprintf(format, v...),
+			callback)
+		if err != nil { log.Fatal(err) }
+		dialog.SetVisible(true)
+		manageWindow(dialog)
+	}
+}
+
+func applicationOpenUrls (app Application, args ...string) {
+	application, ok := app.(ApplicationURLOpener)
+	if !ok {
 		if len(args) > 0 {
 			log.Fatal("nasin: this application cannot open URLs")
 		}
+		return
+	}
+	
+	openNone := func () bool {
+		window, err := application.OpenNone()
+		if err != nil {
+			log.Fatalf("nasin: could not open main window: %v", err)
+			return false
+		}
+		manageWindow(window)
+		return true
+	}
+	
+	if len(args) <= 0 {
+		openNone()
+		return
+	}
+
+	openedAny := false
+	for _, arg := range flag.Args() {
+		ur, err := url.Parse(arg)
+		if err != nil {
+			log.Fatalf (
+				"nasin: invalid URL %v: %v",
+				arg, err)
+		}
+		if ur.Scheme == "" {
+			ur.Scheme = "file"
+		}
+		window, err := application.OpenURL(ur)
+		if err != nil {
+			errorPopupf(
+				"Could Not Open URL",
+				"Could not open %v: %v",
+				arg, err,
+			)(func () {
+				if !openedAny {
+					openNone()
+				}
+			})
+		}
+		manageWindow(window)
 	}
 }
 

go.mod

@@ -4,9 +4,9 @@ go 1.22.2
 
 require (
 	git.tebibyte.media/sashakoshka/goparse v0.2.0
-	git.tebibyte.media/tomo/backend v0.6.1
-	git.tebibyte.media/tomo/objects v0.21.0
-	git.tebibyte.media/tomo/tomo v0.45.0
+	git.tebibyte.media/tomo/backend v0.7.0
+	git.tebibyte.media/tomo/objects v0.22.0
+	git.tebibyte.media/tomo/tomo v0.46.1
 	git.tebibyte.media/tomo/xdg v0.1.0
 	golang.org/x/image v0.11.0
 )

go.sum

@@ -1,12 +1,12 @@
 git.tebibyte.media/sashakoshka/goparse v0.2.0 h1:uQmKvOCV2AOlCHEDjg9uclZCXQZzq2PxaXfZ1aIMiQI=
 git.tebibyte.media/sashakoshka/goparse v0.2.0/go.mod h1:tSQwfuD+EujRoKr6Y1oaRy74ZynatzkRLxjE3sbpCmk=
 git.tebibyte.media/sashakoshka/xgbkb v1.0.0/go.mod h1:pNcE6TRO93vHd6q42SdwLSTTj25L0Yzggz7yLe0JV6Q=
-git.tebibyte.media/tomo/backend v0.6.1 h1:TVbvfbcMrF8YAVGsXPQNQLCam3xuOWJmZA0B+op0ig0=
-git.tebibyte.media/tomo/backend v0.6.1/go.mod h1:7gl0Z1V8Vcns41pXIpQt1FYlANrQf5bCboxMjTCCrgc=
-git.tebibyte.media/tomo/objects v0.21.0 h1:exFbzQPQhGIVQK5BCDg69ZV96zMamV50G4GRsnK+yfA=
-git.tebibyte.media/tomo/objects v0.21.0/go.mod h1:ljnNcCuNfvcYLHmQrEU7LuG0OvQiAVDCXU+ajspq+TI=
-git.tebibyte.media/tomo/tomo v0.45.0 h1:fQH0WIPidW275hOq9dE6R7p064xG1RGx2QU68Avlr84=
-git.tebibyte.media/tomo/tomo v0.45.0/go.mod h1:WrtilgKB1y8O2Yu7X4mYcRiqOlPR8NuUnoA/ynkQWrs=
+git.tebibyte.media/tomo/backend v0.7.0 h1:12A+IsbwIKCmg4jKjD9xCDz+o7R3X6Yp8cZup+wOGIM=
+git.tebibyte.media/tomo/backend v0.7.0/go.mod h1:G3Kh6N2MuiAwsnuPe3h9CwWL65vmmsaqgapA38MPyhk=
+git.tebibyte.media/tomo/objects v0.22.0 h1:2t21W32HW2xvPBICqmArVMVWxg9ohhTJw6ChZ0DcdYY=
+git.tebibyte.media/tomo/objects v0.22.0/go.mod h1:f5J5tAhO+eN5glVbCJLPSopIeTylXqLgKLVAIg8iAPQ=
+git.tebibyte.media/tomo/tomo v0.46.1 h1:/8fT6I9l4TK529zokrThbNDHGRvUsNgif1Zs++0PBSQ=
+git.tebibyte.media/tomo/tomo v0.46.1/go.mod h1:WrtilgKB1y8O2Yu7X4mYcRiqOlPR8NuUnoA/ynkQWrs=
 git.tebibyte.media/tomo/typeset v0.7.1 h1:aZrsHwCG5ZB4f5CruRFsxLv5ezJUCFUFsQJJso2sXQ8=
 git.tebibyte.media/tomo/typeset v0.7.1/go.mod h1:PwDpSdBF3l/EzoIsa2ME7QffVVajnTHZN6l3MHEGe1g=
 git.tebibyte.media/tomo/xdg v0.1.0 h1:6G2WYPPiM2IXleCpKKHuJA34BxumwNWuLsUoX3yu5zA=

internal/icons/fallback/icon.go

@@ -111,9 +111,14 @@ func generateSource (data []byte, width int) map[tomo.Icon] canvas.Texture {
 	col(tomo.IconInsertLink)
 	col(tomo.IconInsertObject)
 	col(tomo.IconInsertText)
+
+	row()
 	// actions: list
 	col(tomo.IconListAdd)
 	col(tomo.IconListRemove)
+	col(tomo.IconListChoose)
+	col(tomo.IconListExpand)
+	col(tomo.IconListContract)
 
 	row()
 	// actions: mail
@@ -311,9 +316,6 @@ func generateSource (data []byte, width int) map[tomo.Icon] canvas.Texture {
 	col(tomo.IconPlacePreferences)
 
 	row()
-	// status: checkbox
-	col(tomo.IconCheckboxChecked)
-	col(tomo.IconCheckboxUnchecked)
 	// status: appointments
 	col(tomo.IconAppointmentMissed)
 	col(tomo.IconAppointmentSoon)

internal/styles/aluminum/aluminum.tss

@@ -19,18 +19,18 @@ $ColorCalendarWeekend       = #c2d3c4;
 $ColorCalendarDay           = #d6dae2;
 
 // Borders
-$BorderOutline        = $ColorOutline                   / 1;
-$BorderEngraved       = #c3c3c5 #e3e3e3 #e9e9e9 #c2c2c2 / 1;
-$BorderGap            = #697c7c #566767 #566767 #697c7c / 1;
-$BorderLifted         = #f9fafc #c2c8d3 #a4afc0 #f5f6f8 / 1;
-$BorderLiftedFocused  = #f0f4f9 #b1baca #9aa6b7 #e4e9ee / 1;
-$BorderFocused        = #5f8bc4 #5f8bc4 #5f8bc4 #5f8bc4 / 1;
-$BorderTear           = $BorderEngraved;
-$BorderTearFocused    = #7f94b5 #ced7e4 #ced7e4 #7f94b5 / 1;
-$BorderTearPad        = #0000                           / 3;
-$BorderTearPadFocused = #7391c080                       / 3;
-$BorderInnerShadow    = #a4afc0                         / 1 0 0 1;
-$BorderOuterShadow    = #a4afc0                         / 0 1 1 0;
+$BorderOutline        = $ColorOutline                  ;
+$BorderEngraved       = #c3c3c5 #e3e3e3 #e9e9e9 #c2c2c2;
+$BorderGap            = #697c7c #566767 #566767 #697c7c;
+$BorderLifted         = #f9fafc #c2c8d3 #a4afc0 #f5f6f8;
+$BorderLiftedFocused  = #f0f4f9 #b1baca #9aa6b7 #e4e9ee;
+$BorderFocused        = #5f8bc4 #5f8bc4 #5f8bc4 #5f8bc4;
+$BorderTear           = $BorderEngraved                ;
+$BorderTearFocused    = #7f94b5 #ced7e4 #ced7e4 #7f94b5;
+$BorderTearPad        = #0000                          ;
+$BorderTearPadFocused = #7391c080                      ;
+$BorderInnerShadow    = #a4afc0                        ;
+$BorderOuterShadow    = #a4afc0                        ;
 
 *.* {
 	TextColor: $ColorForeground;
@@ -39,13 +39,13 @@ $BorderOuterShadow    = #a4afc0                         / 0 1 1 0;
 }
 
 *.Button {
-	Border:  $BorderEngraved, $BorderGap, $BorderLifted;
+	Border:  $BorderEngraved / 1, $BorderGap / 1, $BorderLifted / 1;
 	Padding: 4 8;
 	Color:   $ColorRaised;
 }
 
 *.Button[focused] {
-	Border:  $BorderEngraved, $BorderGap, $BorderLiftedFocused;
+	Border:  $BorderEngraved / 1, $BorderGap / 1, $BorderLiftedFocused / 1;
 	Padding: 4 8;
 	Color:   $ColorRaisedFocused;
 }
@@ -55,23 +55,23 @@ $BorderOuterShadow    = #a4afc0                         / 0 1 1 0;
 }
 
 *.Button[pressed] {
-	Border:  $BorderEngraved, $BorderGap, $BorderInnerShadow;
+	Border:  $BorderEngraved / 1, $BorderGap / 1, $BorderInnerShadow / 1 0 0 1;
 	Padding: 5 8 4 9;
 	Color:   $ColorRaisedPressed;
 }
 
 *.TextInput {
-	Border:  $BorderEngraved, $BorderGap, $BorderInnerShadow;
+	Border:  $BorderEngraved / 1, $BorderGap / 1, $BorderInnerShadow / 1 0 0 1;
 	Padding: 5 4 4 5;
 	Color:   $ColorSunken;
 }
 
 *.TextInput[focused] {
-	Border: $BorderEngraved, $BorderFocused, $BorderInnerShadow;
+	Border: $BorderEngraved / 1, $BorderFocused / 1, $BorderInnerShadow / 1 0 0 1;
 }
 
 *.TextView {
-	Border:  $BorderEngraved, $BorderGap, $BorderInnerShadow;
+	Border:  $BorderEngraved / 1, $BorderGap / 1, $BorderInnerShadow / 1 0 0 1;
 	Padding: 5 4 4 5;
 	Color:   $ColorSunken;
 }
@@ -81,7 +81,7 @@ $BorderOuterShadow    = #a4afc0                         / 0 1 1 0;
 }
 
 *.Container[sunken] {
-	Border:  $BorderEngraved, $BorderGap, $BorderInnerShadow;
+	Border:  $BorderEngraved / 1, $BorderGap / 1, $BorderInnerShadow / 1 0 0 1;
 	Padding: 5 4 4 5;
 	Color:   $ColorSunken;
 }
@@ -92,7 +92,13 @@ $BorderOuterShadow    = #a4afc0                         / 0 1 1 0;
 }
 
 *.Container[menu] {
-	Border: $BorderGap, $BorderLifted;
+	Border: $BorderGap / 1, $BorderLifted / 1;
+	Color:  $ColorBackground;
+	Gap:    0;
+}
+
+*.Container[menu, torn] {
+	Border: ;
 	Color:  $ColorBackground;
 	Gap:    0;
 }
@@ -101,17 +107,22 @@ $BorderOuterShadow    = #a4afc0                         / 0 1 1 0;
 	Align: middle middle;
 }
 
+*.Heading[menu] {
+	Align:   middle middle;
+	Padding: 4 8;
+}
+
 *.Separator {
-	Border: $BorderEngraved;
+	Border: $BorderEngraved / 1;
 }
 
 *.Slider {
-	Border: $BorderEngraved, $BorderGap, $BorderInnerShadow;
+	Border: $BorderEngraved / 1, $BorderGap / 1, $BorderInnerShadow / 1 0 0 1;
 	Color:  $ColorGutter;
 }
 
 *.Slider[focused] {
-	Border: $BorderEngraved, $BorderFocused, $BorderInnerShadow;
+	Border: $BorderEngraved / 1, $BorderFocused / 1, $BorderInnerShadow / 1 0 0 1;
 }
 
 *.Slider[hovered] {
@@ -127,7 +138,34 @@ $BorderOuterShadow    = #a4afc0                         / 0 1 1 0;
 }
 
 *.SliderHandle {
-	Border:      $BorderOuterShadow, $BorderGap, $BorderLifted;
+	Border:      $BorderOuterShadow / 0 1 1 0, $BorderGap / 1, $BorderLifted / 1;
+	Color:       $ColorRaised;
+	MinimumSize: 12;
+}
+
+*.Scrollbar {
+	Border: $BorderEngraved / 1, $BorderGap / 1, $BorderInnerShadow / 1 0 0 1;
+	Color:  $ColorGutter;
+}
+
+*.Scrollbar[focused] {
+	Border: $BorderEngraved / 1, $BorderFocused / 1, $BorderInnerShadow / 1 0 0 1;
+}
+
+*.Scrollbar[hovered] {
+	Color: $ColorGutterHovered;
+}
+
+*.Scrollbar[horizontal] {
+	MinimumSize: 48 0;
+}
+
+*.Scrollbar[vertical] {
+	MinimumSize: 0 48;
+}
+
+*.ScrollbarHandle {
+	Border:      $BorderOuterShadow / 0 1 1 0, $BorderGap / 1, $BorderLifted / 1;
 	Color:       $ColorRaised;
 	MinimumSize: 12;
 }
@@ -137,14 +175,14 @@ $BorderOuterShadow    = #a4afc0                         / 0 1 1 0;
 }
 
 *.Checkbox {
-	Border:      $BorderEngraved, $BorderGap, $BorderInnerShadow;
+	Border:      $BorderEngraved / 1, $BorderGap / 1, $BorderInnerShadow / 1 0 0 1;
 	Color:       $ColorSunken;
 	Padding:     0 1 1 0;
 	MinimumSize: 19;
 }
 
 *.Checkbox[focused] {
-	Border:  $BorderEngraved, $BorderFocused, $BorderInnerShadow;
+	Border:  $BorderEngraved / 1, $BorderFocused / 1, $BorderInnerShadow / 1 0 0 1;
 	Color:   $ColorSunkenFocused;
 	Padding: 0;
 }
@@ -177,19 +215,19 @@ $BorderOuterShadow    = #a4afc0                         / 0 1 1 0;
 }
 
 *.TearLine {
-	Border: $BorderTearPad, $BorderTear;
+	Border: $BorderTearPad / 3, $BorderTear / 1;
 }
 
 *.TearLine[hovered] {
-	Border: $BorderTearPadFocused, $BorderTearFocused;
+	Border: $BorderTearPadFocused / 3, $BorderTearFocused / 1;
 }
 
 *.TearLine[focused] {
-	Border: $BorderTearPadFocused, $BorderTearFocused;
+	Border: $BorderTearPadFocused / 3, $BorderTearFocused / 1;
 }
 
 *.Calendar {
-	Border:  $BorderOuterShadow, $BorderGap;
+	Border:  $BorderOuterShadow / 0 1 1 0, $BorderGap / 1;
 	Color:   $ColorRaised;
 	Padding: 2;
 	Gap:     2;
@@ -213,3 +251,69 @@ $BorderOuterShadow    = #a4afc0                         / 0 1 1 0;
 *.CalendarDay[weekend] {
 	Color: $ColorCalendarWeekend;
 }
+
+*.TabbedContainer {
+	Gap: 0;
+}
+
+*.TabRow {
+	Border:  $BorderEngraved / 1 1 0 1, $BorderGap / 1 1 0 1, $BorderInnerShadow / 1 0 0 1;
+	Color:   $ColorSunken;
+	Gap:     0;
+	Padding: 1 0 0 0;
+}
+
+*.Tab {
+	Border:  #0000 / 1 0 0 0, $BorderOuterShadow / 0 1 0 0, $BorderGap / 1 1 0 1, $BorderLifted / 1;
+	Color:   $ColorSunken;
+	Padding: 4 8 2 8;
+}
+
+*.Tab[active] {
+	Border:  $BorderOuterShadow / 0 1 0 0, $BorderGap / 1 1 0 1, $BorderLifted / 1 1 0 1;
+	Color:   $ColorBackground;
+	Padding: 4 8;
+}
+
+*.TabSpacer {
+	Border: $BorderLifted / 0 0 1 0;
+	MinimumSize: 1 0;
+}
+
+*.Swatch {
+	Border:      $BorderEngraved / 1, $BorderGap / 1;
+	Color:       #FFF;
+	MinimumSize: 19;
+}
+
+*.Swatch[focused] {
+	Border: $BorderEngraved / 1, $BorderFocused / 1;
+}
+
+*.ColorPickerMap {
+	Border:      $BorderEngraved / 1, $BorderGap / 1;
+	Color:       $ColorSunken;
+	MinimumSize: 128;
+}
+
+*.Dropdown {
+	Border:  $BorderEngraved / 1, $BorderGap / 1, $BorderLifted / 1;
+	Padding: 4 8;
+	Color:   $ColorRaised;
+}
+
+*.Dropdown[focused] {
+	Border:  $BorderEngraved / 1, $BorderGap / 1, $BorderLiftedFocused / 1;
+	Padding: 4 8;
+	Color:   $ColorRaisedFocused;
+}
+
+*.Dropdown[hovered] {
+	Color: $ColorRaisedHovered;
+}
+
+*.Dropdown[pressed] {
+	Border:  $BorderEngraved / 1, $BorderGap / 1, $BorderInnerShadow / 1 0 0 1;
+	Padding: 5 8 4 9;
+	Color:   $ColorRaisedPressed;
+}

internal/styles/aluminum/old/aluminum.go

@@ -1,18 +0,0 @@
-package aluminumStyle
-
-import "image/color"
-import "git.tebibyte.media/tomo/tomo"
-
-// New returns Aluminum, a futuristic, bluish-white style.
-func New () *style.Style {
-	return &style.Style {
-		Colors: map[tomo.Color] color.Color {
-			tomo.ColorBackground: colorBackground,
-			tomo.ColorForeground: colorForeground,
-			tomo.ColorRaised:     colorRaised,
-			tomo.ColorSunken:     colorSunken,
-			tomo.ColorAccent:     colorFocus,
-		},
-		Rules: rules,
-	}
-}

internal/styles/aluminum/old/style.go

@@ -1,391 +0,0 @@
-package aluminumStyle
-
-import "image/color"
-import "git.tebibyte.media/tomo/tomo"
-import "golang.org/x/image/font/basicfont"
-
-func hex (color uint32) (c color.RGBA) {
-	c.A = uint8(color)
-	c.B = uint8(color >>  8)
-	c.G = uint8(color >> 16)
-	c.R = uint8(color >> 24)
-	return
-}
-
-func border (top, right, bottom, left uint32, width ...int) tomo.Border {
-	return tomo.Border {
-		Width: tomo.I(width...),
-		Color: [4]color.Color {
-			hex(top),    hex(right),
-			hex(bottom), hex(left),
-		},
-	}
-}
-
-var colorDot                   = hex(0x7391c080)
-var colorFocus                 = hex(0x5f8bc4FF)
-var colorHighlight             = hex(0x5f8bc4FF)
-var colorBackground            = hex(0xd4d4d4FF)
-var colorForeground            = color.Black
-
-var colorOutline               = color.Black
-var colorGutter                = hex(0xbfc6d1FF)
-var colorGutterHovered         = hex(0xc5cbd6FF)
-var colorRaised                = hex(0xe9eaeaFF)
-var colorRaisedPressed         = hex(0xccd4ddFF)
-var colorRaisedFocused         = hex(0xcfd6ddFF)
-var colorRaisedHovered         = hex(0xf1f3f5FF)
-var colorSunken                = hex(0xe9eaeaFF)
-var colorSunkenFocused         = hex(0xe0e6eeFF)
-var colorSunkenPressed         = hex(0xe0e6eeFF)
-var colorCalendarWeekdayHeader = hex(0xd3cac2FF)
-var colorCalendarWeekend       = hex(0xc2d3c4FF)
-var colorCalendarDay           = hex(0xd6dae2FF)
-
-var outline = tomo.Border {
-	Width: tomo.I(1),
-	Color: [4]color.Color {
-		colorOutline,
-		colorOutline,
-		colorOutline,
-		colorOutline,
-	},
-}
-
-var borderEngraved       = border(0xc3c3c5FF, 0xe3e3e3FF, 0xe9e9e9ff, 0xc2c2c2ff, 1)
-var borderGap            = border(0x697c7cFF, 0x566767FF, 0x566767ff, 0x697c7cff, 1)
-var borderLifted         = border(0xf9fafcFF, 0xc2c8d3FF, 0xa4afc0ff, 0xf5f6f8ff, 1)
-var borderLiftedFocused  = border(0xf0f4f9FF, 0xb1bacaFF, 0x9aa6b7ff, 0xe4e9eeff, 1)
-var borderFocused        = border(0x5f8bc4FF, 0x5f8bc4FF, 0x5f8bc4ff, 0x5f8bc4ff, 1)
-var borderTear           = borderEngraved
-var borderTearFocused    = border(0x7f94b5FF, 0xced7e4FF, 0xced7e4FF, 0x7f94b5FF, 1)
-var borderTearPad        = border(0x00000000, 0x00000000, 0x00000000, 0x00000000, 3)
-var borderTearPadFocused = border(0x7391c080, 0x7391c080, 0x7391c080, 0x7391c080, 3)
-var borderInnerShadow    = border(0xa4afc0FF, 0xa4afc0FF, 0xa4afc0ff, 0xa4afc0ff, 1, 0, 0, 1)
-var borderOuterShadow    = border(0xa4afc0FF, 0xa4afc0FF, 0xa4afc0ff, 0xa4afc0ff, 0, 1, 1, 0)
-
-var rules = []style.Rule {
-	// *.*[*]
-	style.Rule {
-		Default: style.AS (
-			style.AttrFace      { Face:  basicfont.Face7x13    },
-			style.AttrTextColor { Color: tomo.ColorForeground  },
-			style.AttrDotColor  { Color: colorDot              },
-			style.AttrGap       { X: 8, Y: 8                   },
-		),
-	},
-
-	// *.Button[*]
-	style.Rule {
-		Role: tomo.R("", "Button", ""),
-		Default: style.AS (
-			style.AttrBorder {
-				borderEngraved,
-				borderGap,
-				borderLifted,
-			},
-			style.AttrPadding(tomo.I(4, 8)),
-			style.AttrColor { Color: tomo.ColorRaised },
-		),
-		Pressed: style.AS (
-			style.AttrBorder {
-				borderEngraved,
-				borderGap,
-				borderInnerShadow,
-			},
-			style.AttrPadding(tomo.I(5, 8, 4, 9)),
-			style.AttrColor { Color: colorRaisedPressed },
-		),
-		Focused: style.AS (
-			style.AttrBorder {
-				borderEngraved,
-				borderGap,
-				borderLiftedFocused,
-			},
-			style.AttrPadding(tomo.I(4, 8)),
-			style.AttrColor { Color: colorRaisedFocused },
-		),
-		Hovered: style.AS (
-			style.AttrColor { Color: colorRaisedHovered },
-		),
-	},
-
-	// *.TextInput[*]
-	style.Rule {
-		Role: tomo.R("", "TextInput", ""),
-		Default: style.AS (
-			style.AttrBorder {
-				borderEngraved,
-				borderGap,
-				borderInnerShadow,
-			},
-			style.AttrColor { Color: tomo.ColorSunken },
-			style.AttrPadding(tomo.I(5, 4, 4, 5)),
-		),
-		Focused: style.AS (
-			style.AttrBorder {
-				borderEngraved,
-				borderFocused,
-				borderInnerShadow,
-			},
-		),
-	},
-
-	// *.TextView[*]
-	style.Rule {
-		Role: tomo.R("", "TextView", ""),
-		Default: style.AS (
-			style.AttrBorder {
-				borderEngraved,
-				borderGap,
-				borderInnerShadow,
-			},
-			style.AttrColor { Color: tomo.ColorSunken },
-			style.AttrPadding(tomo.I(8)),
-		),
-	},
-	
-	// *.NumberInput[*]
-	style.Rule {
-		Role: tomo.R("", "NumberInput", ""),
-		Default: style.AS (
-			style.AttrGap { },
-		),
-	},
-
-	// *.Container[sunken]
-	style.Rule {
-		Role: tomo.R("", "Container", "sunken"),
-		Default: style.AS (
-			style.AttrBorder {
-				borderEngraved,
-				borderGap,
-				borderInnerShadow,
-			},
-			style.AttrColor { Color: tomo.ColorSunken },
-			style.AttrPadding(tomo.I(8)),
-		),
-	},
-
-	// *.Container[outer]
-	style.Rule {
-		Role: tomo.R("", "Container", "outer"),
-		Default: style.AS (
-			style.AttrColor { Color: tomo.ColorBackground },
-			style.AttrPadding(tomo.I(8)),
-		),
-	},
-
-	// *.Container[menu]
-	style.Rule {
-		Role: tomo.R("", "Container", "menu"),
-		Default: style.AS (
-			style.AttrBorder {
-				borderGap,
-				borderLifted,
-			},
-			style.AttrColor { Color: tomo.ColorBackground },
-			style.AttrGap { },
-		),
-	},
-
-	// *.Heading[*]
-	style.Rule {
-		Role: tomo.R("", "Heading", ""),
-		Default: style.AS (
-			style.AttrAlign { X: tomo.AlignMiddle, Y: tomo.AlignMiddle },
-		),
-	},
-
-	// *.Separator[*]
-	style.Rule {
-		Role: tomo.R("", "Separator", ""),
-		Default: style.AS (
-			style.AttrBorder {
-				borderEngraved,
-			},
-		),
-	},
-
-	// *.Slider[*]
-	style.Rule {
-		Role: tomo.R("", "Slider", ""),
-		Default: style.AS (
-			style.AttrBorder {
-				borderEngraved,
-				borderGap,
-				borderInnerShadow,
-			},
-			style.AttrColor { Color: colorGutter },
-		),
-		Focused: style.AS (
-			style.AttrBorder {
-				borderEngraved,
-				borderFocused,
-				borderInnerShadow,
-			},
-		),
-		Hovered: style.AS (
-			style.AttrColor { Color: colorGutterHovered },
-		),
-	},
-	
-	// *.Slider[horizontal]
-	style.Rule {
-		Role: tomo.R("", "Slider", "horizontal"),
-		Default: style.AS(style.AttrMinimumSize { X: 48 }),
-	},
-	
-	// *.Slider[vertical]
-	style.Rule {
-		Role: tomo.R("", "Slider", "vertical"),
-		Default: style.AS(style.AttrMinimumSize { Y: 48 }),
-	},
-
-	// *.SliderHandle[*]
-	style.Rule {
-		Role: tomo.R("", "SliderHandle", ""),
-		Default: style.AS (
-			style.AttrBorder {
-				borderOuterShadow,
-				borderGap,
-				borderLifted,
-			},
-			style.AttrColor { Color: tomo.ColorRaised },
-			style.AttrMinimumSize { X: 12, Y: 12, },
-		),
-	},
-
-	// *.Checkbox[*]
-	style.Rule {
-		Role: tomo.R("", "Checkbox", ""),
-		Default: style.AS (
-			style.AttrBorder {
-				borderEngraved,
-				borderGap,
-				borderInnerShadow,
-			},
-			style.AttrColor { Color: tomo.ColorSunken },
-			style.AttrPadding(tomo.I(0, 1, 1, 0)),
-			style.AttrMinimumSize { X: 19, Y: 19 },
-		),
-		Focused: style.AS (
-			style.AttrBorder {
-				borderEngraved,
-				borderFocused,
-				borderInnerShadow,
-			},
-			style.AttrPadding(tomo.I(0)),
-			style.AttrColor { Color: colorSunkenFocused },
-		),
-	},
-
-	// *.LabelCheckbox[*]
-	style.Rule {
-		Role: tomo.R("", "LabelCheckbox", ""),
-		Default: style.AS (
-			style.AttrGap { X: 8, Y: 8 },
-		),
-	},
-
-	// *.MenuItem[*]
-	style.Rule {
-		Role: tomo.R("", "MenuItem", ""),
-		Default: style.AS (
-			style.AttrPadding(tomo.I(4)),
-			style.AttrGap { X: 4, Y: 4 },
-			style.AttrColor { Color: color.Transparent },
-		),
-		Hovered: style.AS (
-			style.AttrColor { Color: colorDot },
-		),
-		Focused: style.AS (
-			style.AttrColor { Color: colorDot },
-		),
-	},
-
-	// *.File[*]
-	style.Rule {
-		Role: tomo.R("", "File", ""),
-		Default: style.AS (
-			style.AttrColor { Color: color.Transparent },
-		),
-		Focused: style.AS (
-			style.AttrColor { Color: colorDot },
-		),
-	},
-	
-	// *.TearLine[*]
-	style.Rule {
-		Role: tomo.R("", "TearLine", ""),
-		Default: style.AS (
-			style.AttrBorder {
-				borderTearPad,
-				borderTear,
-			},
-		),
-		Hovered: style.AS (
-			style.AttrBorder {
-				borderTearPadFocused,
-				borderTearFocused,
-			},
-		),
-		Focused: style.AS (
-			style.AttrBorder {
-				borderTearPadFocused,
-				borderTearFocused,
-			},
-		),
-	},
-	
-	// *.Calendar[*]
-	style.Rule {
-		Role: tomo.R("", "Calendar", ""),
-		Default: style.AS (
-			style.AttrBorder {
-				borderOuterShadow,
-				borderGap,
-			},
-			style.AttrColor { Color: tomo.ColorRaised },
-			style.AttrPadding(tomo.I(2)),
-			style.AttrGap { X: 2, Y: 2 },
-		),
-	},
-	
-	// *.CalendarGrid[*]
-	style.Rule {
-		Role: tomo.R("", "CalendarGrid", ""),
-		Default: style.AS (
-			style.AttrGap { X: 2, Y: 2 },
-		),
-	},
-	
-	// *.CalendarWeekdayHeader[*]
-	style.Rule {
-		Role: tomo.R("", "CalendarWeekdayHeader", ""),
-		Default: style.AS (
-			style.AttrPadding(tomo.I(2)),
-			style.AttrColor { Color: colorCalendarWeekdayHeader },
-		),
-	},
-	
-	// *.CalendarDay[weekday]
-	style.Rule {
-		Role: tomo.R("", "CalendarDay", "weekday"),
-		Default: style.AS (
-			style.AttrPadding(tomo.I(2)),
-			style.AttrMinimumSize { X: 32, Y: 32 },
-			style.AttrColor { Color: colorCalendarDay },
-		),
-	},
-
-	// *.CalendarDay[weekend]
-	style.Rule {
-		Role: tomo.R("", "CalendarDay", "weekend"),
-		Default: style.AS (
-			style.AttrPadding(tomo.I(2)),
-			style.AttrMinimumSize { X: 32, Y: 32 },
-			style.AttrColor { Color: colorCalendarWeekend },
-		),
-	},
-}

internal/styles/fallback/wintergreen.go

@@ -61,7 +61,7 @@ func New () (*style.Style, event.Cookie) {
 	atlasTexture := tomo.NewTexture(atlasImage)
 	
 	textureCheckboxChecked  := atlasTexture.SubTexture(image.Rect( 0,  0, 12, 11))
-	textureCorkboard        := atlasTexture.SubTexture(image.Rect(16,  0, 28, 12))
+	// textureCorkboard        := atlasTexture.SubTexture(image.Rect(16,  0, 28, 12))
 	textureTearLine         := atlasTexture.SubTexture(image.Rect(16, 12, 18, 13))
 	textureHandleVertical   := atlasTexture.SubTexture(image.Rect(28,  0, 29,  2))
 	textureHandleHorizontal := atlasTexture.SubTexture(image.Rect(28,  0, 30,  1))
@@ -160,8 +160,8 @@ rules := []style.Rule {
 				Width: tomo.I(1, 0, 0, 1),
 				Color: borderColorEngraved,
 			}),
-		tomo.AColor(nil),
-		tomo.ATexture(textureCorkboard),
+		tomo.AColor(tomo.ColorSunken),
+		// tomo.ATexture(textureCorkboard),
 		tomo.APadding(8),
 	), tomo.R("", "Container"), "sunken"),
 
@@ -188,6 +188,11 @@ rules := []style.Rule {
 	style.Ru(style.AS (
 		tomo.AAlign(tomo.AlignMiddle, tomo.AlignMiddle),
 	), tomo.R("", "Heading")),
+	
+	// *.Heading
+	style.Ru(style.AS (
+		tomo.APadding(4, 8),
+	), tomo.R("", "Heading"), "menu"),
 
 	// *.Separator
 	style.Ru(style.AS (
@@ -258,6 +263,65 @@ rules := []style.Rule {
 		tomo.ATexture(textureHandleHorizontal),
 	), tomo.R("", "SliderHandle"), "horizontal"),
 
+	// *.Scrollbar
+	style.Ru(style.AS (
+		tomo.AttrBorder {
+			outline,
+			tomo.Border {
+				Width: tomo.I(1, 0, 0, 1),
+				Color: borderColorEngraved,
+			},
+		},
+		tomo.AttrColor { Color: colorGutter },
+		tomo.AttrPadding(tomo.I(0, 1, 1, 0)),
+	), tomo.R("", "Scrollbar")),
+	
+	// *.Scrollbar[focused]
+	style.Ru(style.AS (
+		tomo.ABorder (
+			outline,
+			tomo.Border {
+				Width: tomo.I(1),
+				Color: borderColorFocused,
+			}),
+		tomo.APadding(0),
+	), tomo.R("", "Scrollbar"), "focused"),
+	
+	// *.Scrollbar[horizontal]
+	style.Ru(style.AS (
+		tomo.AMinimumSize(48, 0),
+	), tomo.R("", "Scrollbar"), "horizontal"),
+	
+	// *.Scrollbar[vertical]
+	style.Ru(style.AS (
+		tomo.AMinimumSize(0, 48),
+	), tomo.R("", "Scrollbar"), "vertical"),
+
+	// *.ScrollbarHandle
+	style.Ru(style.AS (
+		tomo.ABorder (
+			outline,
+			tomo.Border {
+				Width: tomo.I(1),
+				Color: borderColorLifted,
+			},
+			tomo.Border {
+				Width: tomo.I(1),
+				Color: [4]color.Color {
+					tomo.ColorRaised, tomo.ColorRaised,
+					tomo.ColorRaised, tomo.ColorRaised,
+				},
+			}),
+		tomo.AColor(nil),
+		tomo.ATexture(textureHandleVertical),
+		tomo.AMinimumSize(12, 12),
+	), tomo.R("", "ScrollbarHandle")),
+
+	// *.ScrollbarHandle[horizontal]
+	style.Ru(style.AS (
+		tomo.ATexture(textureHandleHorizontal),
+	), tomo.R("", "ScrollbarHandle"), "horizontal"),
+
 	// *.ScrollContainer
 	style.Ru(style.AS (
 		tomo.AGap(0, 0),
@@ -498,7 +562,7 @@ rules := []style.Rule {
 				Color: borderColorLifted,
 			},
 		},
-		tomo.AttrPadding(tomo.I(4, 8, 4, 8)),
+		tomo.AttrPadding(tomo.I(4, 8, 7, 8)),
 		tomo.AttrColor { Color: tomo.ColorBackground },
 	), tomo.R("", "Tab"), "active"),
 
@@ -533,6 +597,43 @@ rules := []style.Rule {
 		tomo.AttrColor { Color: tomo.ColorSunken },
 		tomo.AttrMinimumSize { X: 128, Y: 128 },
 	), tomo.R("", "ColorPickerMap")),
+	
+	// *.Dropdown
+	style.Ru(style.AS (
+		tomo.AttrBorder {
+			outline,
+			tomo.Border {
+				Width: tomo.I(1),
+				Color: borderColorLifted,
+			},
+		},
+		tomo.AttrPadding(tomo.I(4, 8)),
+		tomo.AttrColor { Color: tomo.ColorRaised },
+	), tomo.R("", "Dropdown")),
+
+	// *.Dropdown[focused]
+	style.Ru(style.AS (
+		tomo.AttrBorder {
+			outline,
+			tomo.Border {
+				Width: tomo.I(1),
+				Color: borderColorFocused,
+			},
+		},
+	), tomo.R("", "Dropdown"), "focused"),
+	
+	// *.Dropdown[pressed]
+	style.Ru(style.AS (
+		tomo.AttrBorder {
+			outline,
+			tomo.Border {
+				Width: tomo.I(1, 0, 0, 1),
+				Color: borderColorEngraved,
+			},
+		},
+		tomo.AttrPadding(tomo.I(5, 8, 4, 9)),
+		tomo.AttrColor { Color: colorCarvedPressed },
+	), tomo.R("", "Dropdown"), "pressed"),
 }
 
 	return &style.Style {

internal/styles/tss/parse.go

@@ -133,8 +133,8 @@ func (this *parser) parseSelector () (Selector, error) {
 	// tags
 	err = this.ExpectNext(LBracket)
 	if err == nil {
-		this.Next()
 		for {
+			this.Next()
 			err := this.Expect(Ident, String, RBracket)
 			if err != nil { return Selector { }, err }
 			if this.Is(RBracket) { break       }
@@ -142,6 +142,7 @@ func (this *parser) parseSelector () (Selector, error) {
 			selector.Tags = append(selector.Tags, this.Value())
 			err = this.ExpectNext(Comma, RBracket)
 			if err != nil { return Selector { }, err }
+			if this.Is(RBracket) { break }
 		}
 		this.Next()
 	}