Update font

leighmacdonald · Mar 7, 2023 · 21f8a4a · 21f8a4a
1 parent d48e933
commit 21f8a4a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -13,10 +13,6 @@ fmt:
 	gofmt -s -w .
 
 fonts:
-	fyne bundle --pkg ui    -o ./internal/ui/embed_font.go ./internal/ui/resources/JetBrainsMono/fonts/ttf/JetBrainsMono-Regular.ttf
-	fyne bundle --pkg ui -a -o ./internal/ui/embed_font.go ./internal/ui/resources/JetBrainsMono/fonts/ttf/JetBrainsMono-Bold.ttf
-	fyne bundle --pkg ui -a -o ./internal/ui/embed_font.go ./internal/ui/resources/JetBrainsMono/fonts/ttf/JetBrainsMono-Italic.ttf
-	fyne bundle --pkg ui -a -o ./internal/ui/embed_font.go ./internal/ui/resources/JetBrainsMono/fonts/ttf/JetBrainsMono-BoldItalic.ttf
 	fyne bundle --pkg ui    -o ./internal/ui/embed_img.go ./internal/ui/resources/default_avatar.jpg
 	fyne bundle --pkg ui -a -o ./internal/ui/embed_img.go ./internal/ui/resources/Icon.png
 	fyne bundle --pkg ui -a -o ./internal/ui/embed_img.go ./internal/ui/resources/tf2.png

diff --git a/internal/ui/embed_font.go b/internal/ui/embed_font.go
diff --git a/internal/ui/resources/JetBrainsMono b/internal/ui/resources/JetBrainsMono
diff --git a/internal/ui/theme.go b/internal/ui/theme.go
@@ -9,19 +9,7 @@ import (
 type bdTheme struct{}
 
 func (bdTheme) Font(s fyne.TextStyle) fyne.Resource {
-	if s.Monospace {
-		return resourceJetBrainsMonoRegularTtf
-	}
-	if s.Bold {
-		if s.Italic {
-			return resourceJetBrainsMonoBoldItalicTtf
-		}
-		return resourceJetBrainsMonoBoldTtf
-	}
-	if s.Italic {
-		return resourceJetBrainsMonoItalicTtf
-	}
-	return resourceJetBrainsMonoRegularTtf
+	return theme.DefaultTheme().Font(s)
 }
 
 func (bdTheme) Color(c fyne.ThemeColorName, v fyne.ThemeVariant) color.Color {