Skip to content

refactor：简化头像计算，新增头像最大尺寸参数，避免头像裁剪出来太大 || refactor: Simplify the avatar calculation and add a new avatar. Maximum size parameter to prevent the avatar from being cropped too large #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hxg2050 wants to merge 7 commits into
base: master
Choose a base branch
from
Open

refactor：简化头像计算，新增头像最大尺寸参数，避免头像裁剪出来太大 || refactor: Simplify the avatar calculation and add a new avatar. Maximum size parameter to prevent the avatar from being cropped too large #199

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
27704cd
refactor：简化头像计算，新增头像最大尺寸参数，避免头像裁剪出来太大
hxg2050 Jan 11, 2024
87bb0e3
fix: 改为通用
hxg2050 Jan 11, 2024
4d9aa72
fix: maxSize 作为参数
hxg2050 Jan 11, 2024
0e732d3
fix: 可以正确旋转了
hxg2050 Jan 11, 2024
854d52e
fix: 修复旋转中心点
hxg2050 Jan 11, 2024
163f79e
fix: maxSize
hxg2050 Jan 12, 2024
c8e5102
fix: 头像最大尺寸设定为256
hxg2050 Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
refactor：简化头像计算，新增头像最大尺寸参数，避免头像裁剪出来太大
  • Loading branch information
@hxg2050
hxg2050 committed Jan 11, 2024
commit 27704cd5f7971df176dbcc2cf043c7a4e676cf7d
36 changes: 14 additions & 22 deletions client/web/src/components/modals/ImageCropper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,36 +85,28 @@ function getCroppedImg(
const ctx = canvas.getContext('2d');

if (!_isNil(ctx)) {
const maxSize = Math.max(image.width, image.height);
const safeArea = 2 * ((maxSize / 2) * Math.sqrt(2));
// 设置头像大小
const size = 256;

// set each dimensions to double largest dimension to allow for a safe area for the
// image to rotate in without being clipped by canvas context
canvas.width = safeArea;
canvas.height = safeArea;
canvas.width = size;
canvas.height = size;

// translate canvas context to a central location on image to allow rotating around the center.
ctx.translate(safeArea / 2, safeArea / 2);
ctx.translate(size / 2, size / 2);
ctx.rotate(getRadianAngle(rotation));
ctx.translate(-safeArea / 2, -safeArea / 2);
ctx.translate(-size / 2, -size / 2);

// draw rotated image and store data.
ctx.drawImage(
image,
safeArea / 2 - image.width * 0.5,
safeArea / 2 - image.height * 0.5
);
const data = ctx.getImageData(0, 0, safeArea, safeArea);

// set canvas width to final desired crop size - this will clear existing context
canvas.width = crop.width;
canvas.height = crop.height;

// paste generated rotate image with correct offsets for x,y crop values.
ctx.putImageData(
data,
Math.round(0 - safeArea / 2 + image.width * 0.5 - crop.x),
Math.round(0 - safeArea / 2 + image.height * 0.5 - crop.y)
crop.x,
crop.y,
crop.width,
crop.height,
0,
0,
size,
size
);

@moonrailgun moonrailgun Jan 11, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function is design for common image cropper not only for avatar. for example: group background.

maybe you can check component in client/web/src/components/ImageUploader.tsx#AvatarUploader

@hxg2050 hxg2050 Jan 11, 2024

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, understanding

}

Expand Down