From 876a9f642a3f1ae187d750e4eb469b1fa4f1a42e Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Wed, 29 Jul 2015 13:40:24 -0700 Subject: Changed text initial size and positioning to better handle different image sizes and removed dead code --- api/user.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/api/user.go b/api/user.go index 67e459701..8832ad33f 100644 --- a/api/user.go +++ b/api/user.go @@ -635,11 +635,13 @@ func createProfileImage(username string, userId string) ([]byte, *model.AppError return nil, model.NewAppError("createProfileImage", "Could not create default profile image font", err.Error()) } + width := int(utils.Cfg.ImageSettings.ProfileWidth) + height := int(utils.Cfg.ImageSettings.ProfileHeight) color := colors[int64(seed)%int64(len(colors))] - dstImg := image.NewRGBA(image.Rect(0, 0, int(utils.Cfg.ImageSettings.ProfileWidth), int(utils.Cfg.ImageSettings.ProfileHeight))) + dstImg := image.NewRGBA(image.Rect(0, 0, width, height)) srcImg := image.White draw.Draw(dstImg, dstImg.Bounds(), &image.Uniform{color}, image.ZP, draw.Src) - size := float64(62) + size := float64((width + height) / 4) c := freetype.NewContext() c.SetFont(font) @@ -648,7 +650,7 @@ func createProfileImage(username string, userId string) ([]byte, *model.AppError c.SetDst(dstImg) c.SetSrc(srcImg) - pt := freetype.Pt(int(utils.Cfg.ImageSettings.ProfileWidth)/2-45, int(utils.Cfg.ImageSettings.ProfileHeight)/2+20) + pt := freetype.Pt(width/6, height*2/3) _, err = c.DrawString(initial, pt) if err != nil { return nil, model.NewAppError("createProfileImage", "Could not add user initial to default profile picture", err.Error()) -- cgit v1.2.3-1-g7c22