nosklo
/
DrawOnYourScreen
mirror of https://codeberg.org/som/DrawOnYourScreen
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cr.save, cr.stroke, cr.identityMatrix 

* Use `cr.save` and `cr.stroke` (Restore the context but not the path).
* Use `cr.identityMatrix` to clean context after transformations.
  Inverting transformations was not enough, in particular with combinations of scale and rotate (`SCALE_ANGLE`, `REFLECTION`, ...).
  Now all elements can be grabbed correctly.
This commit is contained in:
abakkk 2020-06-17 15:27:18 +02:00
parent c26c8cd2b5
commit 6a0c0e525a
1 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
draw.js
View File

@ -215,6 +215,7 @@ var DrawingArea = new Lang.Class({
let cr = this.get_context(); let cr = this.get_context();
for (let i = 0; i < this.elements.length; i++) { for (let i = 0; i < this.elements.length; i++) {
cr.save();
let isStraightLine = this.elements[i].shape == Shapes.LINE && let isStraightLine = this.elements[i].shape == Shapes.LINE &&
(this.elements[i].points.length < 3 || (this.elements[i].points.length < 3 ||
this.elements[i].points[2] == this.elements[i].points[1] || this.elements[i].points[2] == this.elements[i].points[1] ||
@ -236,9 +237,11 @@ var DrawingArea = new Lang.Class({
} else { } else {
cr.stroke(); cr.stroke();
} }
cr.restore();
} }
if (this.currentElement) { if (this.currentElement) {
cr.save();
this.currentElement.buildCairo(cr, { showTextCursor: this.textHasCursor, this.currentElement.buildCairo(cr, { showTextCursor: this.textHasCursor,
showTextRectangle: this.currentElement.shape == Shapes.TEXT && this.currentElement.textState == TextStates.DRAWING }) showTextRectangle: this.currentElement.shape == Shapes.TEXT && this.currentElement.textState == TextStates.DRAWING })
@ -246,9 +249,11 @@ var DrawingArea = new Lang.Class({
crSetDummyStroke(cr); crSetDummyStroke(cr);
cr.stroke(); cr.stroke();
cr.restore();
} }
if (this.isInDrawingMode && this.hasGrid && this.gridGap && this.gridGap >= 1) { if (this.isInDrawingMode && this.hasGrid && this.gridGap && this.gridGap >= 1) {
cr.save();
Clutter.cairo_set_source_color(cr, this.gridColor); Clutter.cairo_set_source_color(cr, this.gridColor);
cr.setDash([], 0); cr.setDash([], 0);
@ -267,6 +272,7 @@ var DrawingArea = new Lang.Class({
gridY += this.gridGap; gridY += this.gridGap;
cr.stroke(); cr.stroke();
} }
cr.restore();
} }
cr.$dispose(); cr.$dispose();
@ -405,10 +411,9 @@ var DrawingArea = new Lang.Class({
else if (this.transformingElement == element) else if (this.transformingElement == element)
this.transformingElement = null; this.transformingElement = null;
if (element == this.elements[this.elements.length - 1]) { if (element == this.elements[this.elements.length - 1])
// All elements have been tested, the winner is the last. // All elements have been tested, the winner is the last.
this.updatePointerCursor(); this.updatePointerCursor();
}
}, },
_startElementFinder: function() { _startElementFinder: function() {
@ -1193,42 +1198,20 @@ const DrawingElement = new Lang.Class({
} }
} }
this.transformations.forEach(transformation => { cr.identityMatrix();
if (transformation.type == Transformations.TRANSLATION) {
cr.translate(-transformation.slideX, -transformation.slideY);
} else if (transformation.type == Transformations.ROTATION) {
let center = this._getCenterWithSlideBefore(transformation);
crRotate(cr, -transformation.angle, center[0], center[1]);
} else if (transformation.type == Transformations.SCALE_PRESERVE) {
let center = this._getCenterWithSlideBefore(transformation);
crScale(cr, 1 / transformation.scale, 1 / transformation.scale, center[0], center[1]);
} else if (transformation.type == Transformations.SCALE) {
let center = this._getCenterWithSlideBefore(transformation);
crScale(cr, 1 / transformation.scaleX, 1 / transformation.scaleY, center[0], center[1]);
} else if (transformation.type == Transformations.SCALE_ANGLE) {
let center = this._getCenterWithSlideBefore(transformation);
crRotate(cr, -transformation.angle, center[0], center[1]);
crScale(cr, 1 / transformation.scale, 1, center[0], center[1]);
crRotate(cr, transformation.angle, center[0], center[1]);
}
});
}, },
getContainsPoint: function(cr, x, y) { getContainsPoint: function(cr, x, y) {
if (this.shape == Shapes.TEXT) if (this.shape == Shapes.TEXT)
return cr.inFill(x, y); return cr.inFill(x, y);
cr.save();
cr.setLineWidth(Math.max(this.line.lineWidth, 25)); cr.setLineWidth(Math.max(this.line.lineWidth, 25));
cr.setDash([], 0); cr.setDash([], 0);
// Check whether the point is inside/on/near the element. // Check whether the point is inside/on/near the element.
let inElement = cr.inStroke(x, y) || this.fill && cr.inFill(x, y); let inElement = cr.inStroke(x, y) || this.fill && cr.inFill(x, y);
cr.restore();
cr.setLineWidth(this.line.lineWidth);
if (this.dash.active)
cr.setDash(this.dash.array, this.dash.offset);
else
cr.setDash([], 0);
return inElement; return inElement;
}, },