|
[-]
[+]
|
Changed |
_service:tar_git:harbour-paint.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:paint.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/kimmoli/paint.git</param>
<param name="branch">master</param>
- <param name="revision">57972fda0a8cf23bf0d4139fe7f169a72bc6377e</param>
+ <param name="revision">58f6c411926f059991de57a00002a0eddc422387</param>
<param name="token"/>
<param name="debian"/>
<param name="dumb"/>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-paint-0.8.20.tar.bz2/paint.pro
^
|
| @@ -127,7 +127,9 @@
qml/brush/path4185-9.png \
qml/brush/path4138-1.png \
qml/brush/path4169.png \
- qml/brush/rect4171.png
+ qml/brush/rect4171.png \
+ qml/icons/icon-m-geom-freehand-closed.png \
+ qml/icons/icon-m-geom-freehand-closed-filled.png
TRANSLATIONS += i18n/*.ts
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-paint-0.8.20.tar.bz2/qml/code/drawinghelpers.js
^
|
| @@ -444,3 +444,28 @@
ctx.restore()
}
}
+
+function drawFreehandClosed(ctx, points, lineThick, lineColor, fill)
+{
+ if (points.length < 2)
+ return
+
+ ctx.lineWidth = lineThick
+ ctx.strokeStyle = lineColor
+ ctx.fillStyle = lineColor
+
+ ctx.beginPath()
+ ctx.moveTo(points[0].x, points[0].y)
+
+ for (var i = 1; i<points.length; i++)
+ {
+ ctx.lineTo(points[i].x, points[i].y)
+ }
+
+ ctx.closePath()
+
+ if (fill)
+ ctx.fill()
+
+ ctx.stroke()
+}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-paint-0.8.20.tar.bz2/qml/components/DrawingCanvas.qml
^
|
| @@ -184,6 +184,10 @@
case Painter.Arrow:
Draw.drawArrow(ctx, previewCanvas.downX, previewCanvas.downY, area.gMouseX, area.gMouseY, drawThickness, colors[drawColor], geometryFill)
break;
+ case Painter.FreehandClosed:
+ Draw.drawFreehandClosed(ctx, pointData, drawThickness, colors[drawColor], geometryFill)
+ pointData = []
+ break;
default:
console.error("Unimplemented feature")
@@ -288,6 +292,8 @@
drawingCanvas.lastY = gMouseY
drawingCanvas.setOptions()
+
+ pointData = []
switch (drawMode)
{
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-paint-0.8.20.tar.bz2/qml/components/PreviewCanvas.qml
^
|
| @@ -72,6 +72,10 @@
case Painter.Arrow:
Draw.drawArrow(ctx, downX, downY, drawingCanvas.areagMouseX, drawingCanvas.areagMouseY, drawThickness, colors[drawColor], geometryFill)
break;
+ case Painter.FreehandClosed:
+ pointData.push({x:drawingCanvas.areagMouseX, y:drawingCanvas.areagMouseY})
+ Draw.drawFreehandClosed(ctx, pointData, drawThickness, colors[drawColor], geometryFill)
+ break;
default:
break;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-paint-0.8.20.tar.bz2/qml/components/Toolbar1.qml
^
|
| @@ -73,6 +73,8 @@
return geometryFill ? "image://paintIcons/icon-m-geom-polygram-filled" : "image://paintIcons/icon-m-geom-polygram"
if (geometricsMode == Painter.Arrow)
return geometryFill ? "image://paintIcons/icon-m-geom-arrow-filled" : "image://paintIcons/icon-m-geom-arrow"
+ if (geometricsMode == Painter.FreehandClosed)
+ return geometryFill ? "image://paintIcons/icon-m-geom-freehand-closed-filled" : "image://paintIcons/icon-m-geom-freehand-closed"
}
else
{
|
|
|
Added |
_service:tar_git:harbour-paint-0.8.20.tar.bz2/qml/icons/icon-m-geom-freehand-closed-filled.png
^
|
|
|
Added |
_service:tar_git:harbour-paint-0.8.20.tar.bz2/qml/icons/icon-m-geom-freehand-closed.png
^
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-paint-0.8.20.tar.bz2/qml/paint.qml
^
|
| @@ -75,6 +75,7 @@
property bool clipboardPastePending: false
property int activeLayer: 0
+ property var pointData: []
/*****************************************************/
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-paint-0.8.20.tar.bz2/src/PainterClass.h
^
|
| @@ -71,7 +71,8 @@
RightIsoscelesTriangle,
Polygon,
Polygram,
- Arrow
+ Arrow,
+ FreehandClosed
};
signals:
|
