-
-
Notifications
You must be signed in to change notification settings - Fork 3.6k
fix(Controls) avoid sliding with stroke uniform #9458
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
Closed
Closed
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
24d990a
avoid sliding with stroke uniform
asturur 79a22f1
update CHANGELOG.md
github-actions[bot] 7c1d5ab
no changes to sandbox
asturur 25e6343
Merge branch 'polyline-stroke-uniform' of github.com:fabricjs/fabric.…
asturur 90df8a3
fix comment
asturur 61a3e6d
added test
asturur e0077d6
not only
asturur a609f00
remove changes to vanilla template
asturur d880275
update CHANGELOG.md
github-actions[bot] File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
Binary file added
BIN
+5.89 KB
...ts/controls/polygon-controls/index.spec.ts-snapshots/initial-with-transform.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+6.34 KB
...s/polygon-controls/index.spec.ts-snapshots/moved-controls-p2-with-transform.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+5.55 KB
...s/polygon-controls/index.spec.ts-snapshots/moved-controls-p4-with-trasnform.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -80,7 +80,12 @@ export const factoryPolyActionHandler = ( | |
| y: number | ||
| ) { | ||
| const poly = transform.target as Polyline, | ||
| anchorPoint = new Point( | ||
| strokeWidth = poly.strokeWidth; | ||
| // do all calculation without strokeWidth | ||
| // to avoid scaling issues between dimensions and scaling factors | ||
| // when strokeUniform is set as true | ||
| poly.strokeWidth = 0; | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. getStrokeWidthVector(strokeWidth = this.strokeWidth) {
const strokeWidthFactor = new fabric.Point(strokeWidth, strokeWidth);
return this.strokeUniform
? strokeWidthFactor.divide(this.getObjectScaling())
: strokeWidthFactor;
} |
||
| const anchorPoint = new Point( | ||
| poly.points[(pointIndex > 0 ? pointIndex : poly.points.length) - 1] | ||
| ), | ||
| anchorPointInParentPlane = anchorPoint | ||
|
|
@@ -99,7 +104,7 @@ export const factoryPolyActionHandler = ( | |
| newPositionNormalized.x + 0.5, | ||
| newPositionNormalized.y + 0.5 | ||
| ); | ||
|
|
||
| poly.strokeWidth = strokeWidth; | ||
| return actionPerformed; | ||
| }; | ||
| }; | ||
|
|
||
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.
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.
If a two points horizontal polyline with strokeWidth = 0, it's height will be 0. Does the divide in below got NaN?
const newPositionNormalized = anchorPoint
.subtract(poly.pathOffset)
.divide(poly._getNonTransformedDimensions())
.multiply(adjustFlip);