diff --git a/VERSION b/VERSION index 4e2200b98e5625b0c83761d6456fd35746d56f2f..971e119ac759750bffcd3dc818710439d65a9375 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.20.1 +2.21.0 \ No newline at end of file diff --git a/frontend/src/assets/template/avatar/overlay.png b/frontend/src/assets/template/avatar/overlay.png index dd568c87e3168e403ac5d7e8c24e4df6848212dd..a730f3bc3365b4929d1a8fabf320a44b28d9d5e4 100644 Binary files a/frontend/src/assets/template/avatar/overlay.png and b/frontend/src/assets/template/avatar/overlay.png differ diff --git a/frontend/src/assets/template/avatar/overlay2.png b/frontend/src/assets/template/avatar/overlay2.png deleted file mode 100644 index ef370bc13194b9f228059f8f2d82f38bb3f78d32..0000000000000000000000000000000000000000 Binary files a/frontend/src/assets/template/avatar/overlay2.png and /dev/null differ diff --git a/frontend/src/views/avatar/Avatar.vue b/frontend/src/views/avatar/Avatar.vue index 133e1eb925d7496c30370b129f2e3125654189cd..7eebc88d02e3ba168d1d37ed904fa6a03f3e7fc3 100644 --- a/frontend/src/views/avatar/Avatar.vue +++ b/frontend/src/views/avatar/Avatar.vue @@ -12,7 +12,6 @@ import AutoReloadCheckbox from "../../components/reload/AutoReloadCheckbox.vue"; import OverlaySelect from "./OverlaySelect.vue"; import overlayImage1 from "../../assets/template/avatar/overlay.png"; -import overlayImage2 from "../../assets/template/avatar/overlay2.png"; import { toRawDeep } from "../../utils"; </script> @@ -28,13 +27,9 @@ export default { data() { const overlayOptions = { overlay1: { - title: "Lepší opozice (černé pozadí)", + title: "Kolečko", overlayImage: overlayImage1, }, - overlay2: { - title: "Lepší opozice (bílé pozadí)", - overlayImage: overlayImage2, - }, }; return { diff --git a/frontend/src/views/avatar/canvas.js b/frontend/src/views/avatar/canvas.js index 115930a3cc215995e6fa87db9095c16c9b2aebf3..c9f9d183d774e7d2d20d12d6d09298804fef5380 100644 --- a/frontend/src/views/avatar/canvas.js +++ b/frontend/src/views/avatar/canvas.js @@ -119,6 +119,19 @@ const redraw = async (canvas, options) => { pointerDownEventAssigned = true; } + const clipCircle = new fabric.Circle({ + left: canvas.width/2, + top: canvas.height/2, + originX: 'center', + originY: 'center', + radius: canvas.width / 2, + absolutePositioned: true // clip relative to canvas + }); + + // assign it to the canvas + canvas.clipPath = clipCircle; + canvas.renderAll(); + upEventFunction = (event) => { redraw(canvas, options); };