-
Notifications
You must be signed in to change notification settings - Fork 25
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.
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
Fix printing multi canvas of victor layers #1301
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aziz-access
added
the
bug
Incorrect or unexpected behaviors // Anomalies de fonctionnement
label
Jun 22, 2023
alecarn
approved these changes
Jun 27, 2023
Comment on lines
698
to
735
for (let index = 0; index < mapCanvas.length; index++) { | ||
const canvas = mapCanvas[index]; | ||
if (canvas.width > 0) { | ||
const opacity = canvas.parentElement.style.opacity || canvas.style.opacity; | ||
mapContextResult.globalAlpha = opacity === '' ? 1 : Number(opacity); | ||
const transform = canvas.style.transform; | ||
let matrix: number[]; | ||
if (transform) { | ||
// Get the transform parameters from the style's transform matrix | ||
matrix = transform | ||
.match(/^matrix\(([^\(]*)\)$/)[1] | ||
.split(',') | ||
.map(Number); | ||
} else { | ||
matrix = [ | ||
parseFloat(canvas.style.width) / canvas.width, | ||
0, | ||
0, | ||
parseFloat(canvas.style.height) / canvas.height, | ||
0, | ||
0, | ||
]; | ||
} | ||
CanvasRenderingContext2D.prototype.setTransform.apply( | ||
mapContextResult, | ||
matrix | ||
); | ||
const backgroundColor = canvas.parentElement.style.backgroundColor; | ||
if (backgroundColor) { | ||
mapContextResult.fillStyle = backgroundColor; | ||
mapContextResult.fillRect(0, 0, canvas.width, canvas.height); | ||
} | ||
mapContextResult.drawImage(canvas, 0, 0); | ||
mapContextResult.globalAlpha = 1; | ||
// reset canvas transform to initial | ||
mapContextResult.setTransform(1, 0, 0, 1, 0, 0); | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pour la lisibilité, ça serait bien d'isoler ce code dans une méthode.
Suggested change
for (let index = 0; index < mapCanvas.length; index++) { | |
const canvas = mapCanvas[index]; | |
if (canvas.width > 0) { | |
const opacity = canvas.parentElement.style.opacity || canvas.style.opacity; | |
mapContextResult.globalAlpha = opacity === '' ? 1 : Number(opacity); | |
const transform = canvas.style.transform; | |
let matrix: number[]; | |
if (transform) { | |
// Get the transform parameters from the style's transform matrix | |
matrix = transform | |
.match(/^matrix\(([^\(]*)\)$/)[1] | |
.split(',') | |
.map(Number); | |
} else { | |
matrix = [ | |
parseFloat(canvas.style.width) / canvas.width, | |
0, | |
0, | |
parseFloat(canvas.style.height) / canvas.height, | |
0, | |
0, | |
]; | |
} | |
CanvasRenderingContext2D.prototype.setTransform.apply( | |
mapContextResult, | |
matrix | |
); | |
const backgroundColor = canvas.parentElement.style.backgroundColor; | |
if (backgroundColor) { | |
mapContextResult.fillStyle = backgroundColor; | |
mapContextResult.fillRect(0, 0, canvas.width, canvas.height); | |
} | |
mapContextResult.drawImage(canvas, 0, 0); | |
mapContextResult.globalAlpha = 1; | |
// reset canvas transform to initial | |
mapContextResult.setTransform(1, 0, 0, 1, 0, 0); | |
} | |
} | |
for (let index = 0; index < mapCanvas.length; index++) { | |
const canvas = mapCanvas[index]; | |
if (canvas.width > 0) { | |
this.handleCanvas(...) | |
} | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is the current behavior? (You can also link to an open issue here)
Fix printing multi canvas of victor layers
Does this PR introduce a breaking change? (check one with "x")
If this PR contains a breaking change, please describe the impact and migration path for existing applications:
Other information: