From 0895114be9dbd9e801312815759f04cbda763775 Mon Sep 17 00:00:00 2001 From: Vovko Date: Sat, 18 Jan 2025 23:02:51 -0500 Subject: [PATCH] fixed custom background --- internal/stats/render/period/v2/cards.go | 13 ++++++------- render_test.go | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/internal/stats/render/period/v2/cards.go b/internal/stats/render/period/v2/cards.go index 1a49146a..1c0fb617 100644 --- a/internal/stats/render/period/v2/cards.go +++ b/internal/stats/render/period/v2/cards.go @@ -87,15 +87,14 @@ func generateCards(stats fetch.AccountStatsOverPeriod, cards period.Cards, _ []m cardsFrame := facepaint.NewBlocksContent(style.NewStyle(style.Parent(styledCardsFrame)), statsCards...) - // add background branding - if opts.Background != nil && !opts.BackgroundIsCustom { + // resize and place background + if opts.Background != nil { cardsFrameSize := cardsFrame.Dimensions() - seed, _ := strconv.Atoi(stats.Account.ID) opts.Background = imaging.Resize(opts.Background, cardsFrameSize.Width, cardsFrameSize.Height, imaging.Lanczos) - opts.Background = addBackgroundBranding(opts.Background, stats.RegularBattles.Vehicles, seed) - } - // add background - if opts.Background != nil { + if !opts.BackgroundIsCustom { + seed, _ := strconv.Atoi(stats.Account.ID) + opts.Background = addBackgroundBranding(opts.Background, stats.RegularBattles.Vehicles, seed) + } cardsFrame = facepaint.NewBlocksContent(style.NewStyle(), facepaint.MustNewImageContent(styledCardsBackground, opts.Background), cardsFrame, ) diff --git a/render_test.go b/render_test.go index 8b1523a4..d52d8f07 100644 --- a/render_test.go +++ b/render_test.go @@ -30,8 +30,8 @@ import ( _ "github.com/joho/godotenv/autoload" ) -var bgImage = "static://bg-default" -var bgIsCustom = false +var bgImage = "static://test_user_background" +var bgIsCustom = true func init() { loadStaticAssets(static)