mirror/sointu
1
0
Fork 0
mirror of https://github.com/vsariola/sointu.git synced 2025-06-04 01:28:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat(tracker): add thin line separating the controls from the tracker

Browse Source
This commit is contained in:
vsariola 2021-01-09 22:54:32 +02:00
parent 6bdd212336
commit 41cd1d21f6
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tracker/layout.go
View File

@ -3,6 +3,7 @@ package tracker
import ( import (
"fmt" "fmt"
"image" "image"
"image/color"
"log" "log"
"gioui.org/layout" "gioui.org/layout"
@ -47,6 +48,7 @@ func (t *Tracker) Layout(gtx layout.Context) {
layout.UniformInset(unit.Dp(2)).Layout(gtx, func(gtx2 layout.Context) layout.Dimensions { layout.UniformInset(unit.Dp(2)).Layout(gtx, func(gtx2 layout.Context) layout.Dimensions {
return layout.Flex{Axis: layout.Vertical}.Layout(gtx2, return layout.Flex{Axis: layout.Vertical}.Layout(gtx2,
layout.Rigid(t.layoutControls), layout.Rigid(t.layoutControls),
layout.Rigid(t.line(true, separatorLineColor)),
layout.Flexed(1, t.layoutTracker)) layout.Flexed(1, t.layoutTracker))
}) })
} }
@ -190,7 +192,7 @@ func (t *Tracker) layoutControls(gtx layout.Context) layout.Dimensions {
) )
} }
func (t *Tracker) darkLine(horizontal bool) layout.Widget { func (t *Tracker) line(horizontal bool, color color.RGBA) layout.Widget {
return func(gtx layout.Context) layout.Dimensions { return func(gtx layout.Context) layout.Dimensions {
if horizontal { if horizontal {
gtx.Constraints.Min.Y = 1 gtx.Constraints.Min.Y = 1
@ -201,7 +203,7 @@ func (t *Tracker) darkLine(horizontal bool) layout.Widget {
} }
defer op.Push(gtx.Ops).Pop() defer op.Push(gtx.Ops).Pop()
clip.Rect{Max: gtx.Constraints.Max}.Add(gtx.Ops) clip.Rect{Max: gtx.Constraints.Max}.Add(gtx.Ops)
paint.FillShape(gtx.Ops, black, clip.Rect{Max: image.Pt(gtx.Constraints.Max.X, gtx.Constraints.Max.Y)}.Op()) paint.FillShape(gtx.Ops, color, clip.Rect{Max: image.Pt(gtx.Constraints.Max.X, gtx.Constraints.Max.Y)}.Op())
return layout.Dimensions{Size: gtx.Constraints.Max} return layout.Dimensions{Size: gtx.Constraints.Max}
} }
} }

2
tracker/theme.go
View File

@ -46,6 +46,8 @@ var backgroundColor = color.RGBA{R: 18, G: 18, B: 18, A: 255}
var labelFont = fontCollection[6].Font var labelFont = fontCollection[6].Font
var labelFontSize = unit.Px(18) var labelFontSize = unit.Px(18)
var separatorLineColor = color.RGBA{R: 97, G: 97, B: 97, A: 97}
var activeTrackColor = focusedContainerColor var activeTrackColor = focusedContainerColor
var trackSurfaceColor = color.RGBA{R: 18, G: 18, B: 18, A: 18} var trackSurfaceColor = color.RGBA{R: 18, G: 18, B: 18, A: 18}