tomo/nasin
tomo/nasin
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 14 Wiki Activity

Compare commits

base: tomo:1fe74c8e696ec909535dc8bc8d4c7b62e9f66f6c
Branches Tags
tomo:main
tomo:v0.13.0
tomo:v0.12.1
tomo:v0.12.0
tomo:v0.11.0
tomo:v0.10.0
tomo:v0.9.0
tomo:v0.8.0
tomo:v0.7.0
tomo:v0.6.0
tomo:v0.5.0
tomo:v0.4.0
tomo:v0.3.0
tomo:v0.2.0
tomo:v0.1.0
...
compare: tomo:8e2fb26ab55e586cf3eb37e3b5833e72f079a550
Branches Tags
tomo:main
tomo:v0.13.0
tomo:v0.12.1
tomo:v0.12.0
tomo:v0.11.0
tomo:v0.10.0
tomo:v0.9.0
tomo:v0.8.0
tomo:v0.7.0
tomo:v0.6.0
tomo:v0.5.0
tomo:v0.4.0
tomo:v0.3.0
tomo:v0.2.0
tomo:v0.1.0

3 Commits
1fe74c8e69 ... 8e2fb26ab5

Author SHA1 Message Date
sashakoshka@tebibyte.media
8e2fb26ab5 Add styling for calendars 2024-06-19 00:31:50 -04:00
sashakoshka@tebibyte.media
45b2bee72d Update examples 2024-06-19 00:17:44 -04:00
sashakoshka@tebibyte.media
99be133432 Update backend 2024-06-18 19:46:52 -04:00
6 changed files with 143 additions and 31 deletions
Show Stats Expand all files Collapse all files

1
examples/clock/main.go
View File

@ -69,7 +69,6 @@ func NewClockFace () *ClockFace {
CanvasBox: tomo.NewCanvasBox(),
}
box.SetRole(tomo.R("nasin", "ClockFace", ""))
tomo.Apply(box)
box.SetDrawer(box)
return box
}

2
examples/icons/main.go
View File

@ -12,7 +12,7 @@ import "git.tebibyte.media/tomo/nasin/internal/icons/xdg"
const scrollIcons = true
type Application struct {
window tomo.MainWindow
window tomo.Window
size tomo.IconSize
grid tomo.ContainerBox
}

2
go.mod
View File

@ -3,7 +3,7 @@ module git.tebibyte.media/tomo/nasin
go 1.20
require (
git.tebibyte.media/tomo/backend v0.3.0
git.tebibyte.media/tomo/backend v0.4.0
git.tebibyte.media/tomo/objects v0.18.0
git.tebibyte.media/tomo/tomo v0.38.0
git.tebibyte.media/tomo/xdg v0.1.0

4
go.sum
View File

@ -1,6 +1,6 @@
git.tebibyte.media/sashakoshka/xgbkb v1.0.0/go.mod h1:pNcE6TRO93vHd6q42SdwLSTTj25L0Yzggz7yLe0JV6Q=
git.tebibyte.media/tomo/backend v0.3.0 h1:YFy826xA8I473aUsEpn3ZRACEMfnd5WB+1ZgV1ZiKjA=
git.tebibyte.media/tomo/backend v0.3.0/go.mod h1:7FTMMVDlyNEMY+HwogG24kDsnREEIevya+0AjVRFyv0=
git.tebibyte.media/tomo/backend v0.4.0 h1:Sm2DW1gLoco5IWa9L7JQSLa44KJ21zjLTBI7ipXE3WY=
git.tebibyte.media/tomo/backend v0.4.0/go.mod h1:2G04zmKbzf5fA/xzsjoQRrN55BWZkB+vknFxd3ialZ0=
git.tebibyte.media/tomo/objects v0.18.0 h1:oai7V8K9qcrNOkAIWG+GgnMVc01PwIW1KuhmluRpzOk=
git.tebibyte.media/tomo/objects v0.18.0/go.mod h1:GP5BZ6lc2F2D0OxERfr9r46PIk7jFlpq2/BWOpoQDqc=
git.tebibyte.media/tomo/tomo v0.38.0 h1:K5TP67RxnszudeNfmGZiU5cFTRjFueXiI3NCsgw+05U=

84
internal/style/aluminum/style.go
View File

@ -23,22 +23,25 @@ func border (top, right, bottom, left uint32, width ...int) tomo.Border {
}
}
var colorDot = hex(0x7391c080)
var colorFocus = hex(0x5f8bc4FF)
var colorHighlight = hex(0x5f8bc4FF)
var colorBackground = hex(0xd4d4d4FF)
var colorForeground = color.Black
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 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),
@ -335,4 +338,55 @@ var rules = []style.Rule {
},
),
},
// *.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 },
),
},
}

81
internal/style/fallback/style.go
View File

@ -5,17 +5,21 @@ import "git.tebibyte.media/tomo/tomo"
import "golang.org/x/image/font/basicfont"
import "git.tebibyte.media/tomo/nasin/internal/style"
var colorFocus = color.RGBA { R: 61, G: 128, B: 143, A: 255 }
var colorInput = color.RGBA { R: 208, G: 203, B: 150, A: 255 }
var colorCarved = color.RGBA { R: 151, G: 160, B: 150, A: 255 }
var colorGutter = color.RGBA { R: 116, G: 132, B: 126, A: 255 }
var colorShadow = color.RGBA { R: 57, G: 59, B: 57, A: 255 }
var colorInputShadow = color.RGBA { R: 143, G: 146, B: 91, A: 255 }
var colorHighlight = color.RGBA { R: 207, G: 215, B: 210, A: 255 }
var colorBackground = color.RGBA { R: 169, G: 171, B: 168, A: 255 }
var colorCarvedPressed = color.RGBA { R: 129, G: 142, B: 137, A: 255 }
var colorForeground = color.Black
var colorOutline = color.Black
var colorFocus = color.RGBA { R: 61, G: 128, B: 143, A: 255 }
var colorInput = color.RGBA { R: 208, G: 203, B: 150, A: 255 }
var colorCarved = color.RGBA { R: 151, G: 160, B: 150, A: 255 }
var colorGutter = color.RGBA { R: 116, G: 132, B: 126, A: 255 }
var colorShadow = color.RGBA { R: 57, G: 59, B: 57, A: 255 }
var colorShade = color.RGBA { A: 128 }
var colorInputShadow = color.RGBA { R: 143, G: 146, B: 91, A: 255 }
var colorHighlight = color.RGBA { R: 207, G: 215, B: 210, A: 255 }
var colorBackground = color.RGBA { R: 169, G: 171, B: 168, A: 255 }
var colorCarvedPressed = color.RGBA { R: 129, G: 142, B: 137, A: 255 }
var colorForeground = color.Black
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 outline = tomo.Border {
Width: tomo.I(1),
@ -31,6 +35,7 @@ var borderColorEngraved = [4]color.Color { colorShadow, colorHighlight, col
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 borderColorShade = [4]color.Color { colorShade, colorShade, colorShade, colorShade }
var rules = []style.Rule {
// *.*[*]
@ -342,4 +347,58 @@ var rules = []style.Rule {
},
),
},
// *.Calendar[*]
style.Rule {
Role: tomo.R("", "Calendar", ""),
Default: style.AS (
style.AttrBorder {
tomo.Border {
Width: tomo.I(0, 1, 1, 0),
Color: borderColorShade,
},
outline,
},
style.AttrColor { Color: colorInput },
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 },
),
},
}