Text alignment fixes

SmilyOrg · May 10, 2024 · 297f29b · 297f29b
1 parent f991565
commit 297f29b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/internal/layout/album.go b/internal/layout/album.go
@@ -37,13 +37,14 @@ func LayoutAlbumEvent(layout Layout, rect render.Rect, event *AlbumEvent, scene
 				X: rect.X,
 				Y: rect.Y,
 				W: rect.W,
-				H: 30,
+				H: 40,
 			},
 			&font,
 			event.StartTime.Format(dateFormat),
 		)
+		text.VAlign = canvas.Bottom
 		scene.Texts = append(scene.Texts, text)
-		rect.Y += text.Sprite.Rect.H + 15
+		rect.Y += text.Sprite.Rect.H
 	}
 
 	font := scene.Fonts.Main.Face(50, canvas.Black, canvas.FontRegular, canvas.FontNormal)
@@ -53,21 +54,20 @@ func LayoutAlbumEvent(layout Layout, rect render.Rect, event *AlbumEvent, scene
 			X: rect.X,
 			Y: rect.Y,
 			W: rect.W,
-			H: 30,
+			H: 40,
 		},
 		&font,
 		time,
 	)
+	text.VAlign = canvas.Bottom
 	scene.Texts = append(scene.Texts, text)
-	rect.Y += text.Sprite.Rect.H + 10
+	rect.Y += text.Sprite.Rect.H
 
 	newBounds := addSectionToScene(&event.Section, scene, rect, layout, source)
 
 	rect.Y = newBounds.Y + newBounds.H
 	if event.LastOnDay {
-		rect.Y += 40
-	} else {
-		rect.Y += 6
+		rect.Y += 32
 	}
 	return rect
 }

diff --git a/internal/layout/timeline.go b/internal/layout/timeline.go
@@ -53,14 +53,14 @@ func LayoutTimelineEvent(layout Layout, rect render.Rect, event *TimelineEvent,
 
 	font := scene.Fonts.Main.Face(40, canvas.Black, canvas.FontRegular, canvas.FontNormal)
 
-	scene.Texts = append(scene.Texts,
-		render.NewTextFromRect(
-			textBounds,
-			&font,
-			headerText,
-		),
+	text := render.NewTextFromRect(
+		textBounds,
+		&font,
+		headerText,
 	)
-	rect.Y += textHeight + 15
+	text.VAlign = canvas.Bottom
+	scene.Texts = append(scene.Texts, text)
+	rect.Y += textHeight + 4
 
 	newBounds := addSectionToScene(&event.Section, scene, rect, layout, source)
 

diff --git a/internal/render/text.go b/internal/render/text.go
@@ -30,7 +30,6 @@ func (text *Text) Draw(config *Render, c *canvas.Context, scales Scales) {
 			return
 		}
 
-		// textLine := canvas.NewTextLine(*text.Font, text.Text, canvas.Left)
 		textLine := canvas.NewTextBox(*text.Font, text.Text, text.Sprite.Rect.W, text.Sprite.Rect.H, text.HAlign, text.VAlign, 0, 0)
 		rect := text.Sprite.Rect
 		rect.Y -= rect.H