Skip to content

Fix Screenshots in macOS Safari - adapt to rounded corners #8161

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

Merged
merged 3 commits into from
Apr 9, 2024
Merged

Fix Screenshots in macOS Safari - adapt to rounded corners #8161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d43e1ab
parameterize crop-test
Mar 21, 2024
007b62e
adjust for macOS rounded corners, on retina screens, with highest res…
Mar 26, 2024
3733d36
Merge branch 'master' into master
htho Apr 8, 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
2 changes: 1 addition & 1 deletion src/screenshots/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
export const MARK_BYTES_PER_PIXEL = 4;
export const MARK_LENGTH = 32;
export const MARK_HEIGHT = 10;
export const MARK_RIGHT_MARGIN = 10;
export const MARK_RIGHT_MARGIN = 25;
31 changes: 17 additions & 14 deletions test/server/crop-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
const expect = require('chai').expect;
const expect = require('chai').expect;

const {
MARK_LENGTH,
MARK_BYTES_PER_PIXEL,
MARK_RIGHT_MARGIN,
} = require('../../lib/screenshots/constants');

const {
getClipInfoByCropDimensions,
Expand All @@ -7,23 +13,20 @@ const {
calculateClipInfo,
} = require('../../lib/screenshots/crop');

const markSeed = [
0, 0, 0, 255,
255, 255, 255, 255,
0, 0, 0, 255,
255, 255, 255, 255,
0, 0, 0, 255,
255, 255, 255, 255,
];
const markSeed = Array(MARK_LENGTH).fill().flatMap((_, i) => i % 2 ? [255, 255, 255, 255] : [0, 0, 0, 255]);

function getPngMock (mark = markSeed) {
const markSeedIndex = 6944952;
const width = 1820;
const height = 954;
const width = 1820;
const height = 954;
const length = width * height * MARK_BYTES_PER_PIXEL;
const markSeedOffset = (MARK_LENGTH + MARK_RIGHT_MARGIN) * MARK_BYTES_PER_PIXEL;
const markSeedIndex = length - markSeedOffset;

let data = '-'.repeat(markSeedIndex);
const dataHeader = Buffer.from('-'.repeat(markSeedIndex));
const dataMark = Buffer.from(mark);
const dataTrailer = Buffer.from('-'.repeat(MARK_RIGHT_MARGIN * MARK_BYTES_PER_PIXEL));

data = Buffer.concat([Buffer.from(data), Buffer.from(mark), Buffer.from(data)]);
const data = Buffer.concat([dataHeader, dataMark, dataTrailer]);

return { width, height, data };
}
Expand Down