mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-07 18:44:08 +00:00
Merge branch '317-add-zone-bug-with-zoom' into 'master'
Resolve "Lorsqu'on place manuellement une zone de signature avec le zoom actif, la zone n'est pas placée correctement sur la page" Closes #317 See merge request Chill-Projet/chill-bundles!757
This commit is contained in:
commit
b9e515f4e6
@ -96,8 +96,15 @@
|
||||
>
|
||||
{{ $t("cancel") }}
|
||||
</button>
|
||||
<button v-if="userSignatureZone === null"
|
||||
:class="{ btn: true, 'btn-sm': true, 'btn-create': canvasEvent !== 'add', 'btn-chill-green': canvasEvent === 'add', active: canvasEvent === 'add' }"
|
||||
<button
|
||||
v-if="userSignatureZone === null"
|
||||
:class="{
|
||||
btn: true,
|
||||
'btn-sm': true,
|
||||
'btn-create': canvasEvent !== 'add',
|
||||
'btn-chill-green': canvasEvent === 'add',
|
||||
active: canvasEvent === 'add',
|
||||
}"
|
||||
@click="toggleAddZone()"
|
||||
:title="$t('add_sign_zone')"
|
||||
>
|
||||
@ -200,8 +207,15 @@
|
||||
>
|
||||
{{ $t("cancel") }}
|
||||
</button>
|
||||
<button v-if="userSignatureZone === null"
|
||||
:class="{ btn: true, 'btn-sm': true, 'btn-create': canvasEvent !== 'add', 'btn-chill-green': canvasEvent === 'add', active: canvasEvent === 'add' }"
|
||||
<button
|
||||
v-if="userSignatureZone === null"
|
||||
:class="{
|
||||
btn: true,
|
||||
'btn-sm': true,
|
||||
'btn-create': canvasEvent !== 'add',
|
||||
'btn-chill-green': canvasEvent === 'add',
|
||||
active: canvasEvent === 'add',
|
||||
}"
|
||||
@click="toggleAddZone()"
|
||||
:title="$t('add_sign_zone')"
|
||||
>
|
||||
@ -209,7 +223,7 @@
|
||||
{{ $t("add_zone") }}
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ $t("click_on_document")}}
|
||||
{{ $t("click_on_document") }}
|
||||
<div class="spinner-border spinner-border-sm" role="status">
|
||||
<span class="visually-hidden">Loading...</span>
|
||||
</div>
|
||||
@ -218,8 +232,11 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-md-12 col-lg-9 m-auto my-5 text-center" :class="{onAddZone: canvasEvent === 'add'}">
|
||||
<canvas class="m-auto" id="canvas" ></canvas>
|
||||
<div
|
||||
class="col-xs-12 col-md-12 col-lg-9 m-auto my-5 text-center"
|
||||
:class="{ onAddZone: canvasEvent === 'add' }"
|
||||
>
|
||||
<canvas class="m-auto" id="canvas"></canvas>
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 col-md-12 col-lg-9 m-auto p-4" id="action-buttons">
|
||||
@ -648,11 +665,11 @@ const addZoneEvent = async (e: PointerEvent, canvas: HTMLCanvasElement) => {
|
||||
scaleXToCanvas(x, canvas.width, PDFPageWidth) -
|
||||
scaleXToCanvas(BOX_WIDTH / 2, canvas.width, PDFPageWidth),
|
||||
y:
|
||||
PDFPageHeight -
|
||||
PDFPageHeight * zoom.value -
|
||||
scaleYToCanvas(y, canvas.height, PDFPageHeight) +
|
||||
scaleYToCanvas(BOX_HEIGHT / 2, canvas.height, PDFPageHeight),
|
||||
width: BOX_WIDTH,
|
||||
height: BOX_HEIGHT,
|
||||
width: BOX_WIDTH * zoom.value,
|
||||
height: BOX_HEIGHT * zoom.value,
|
||||
PDFPage: {
|
||||
index: page.value - 1,
|
||||
width: PDFPageWidth,
|
||||
|
Loading…
x
Reference in New Issue
Block a user