Merge branch 'main' into Bug-Multitool-Filename

This commit is contained in:
Dimitris Kaitantzidis
2023-10-14 00:06:36 +03:00
committed by GitHub
12 changed files with 1320 additions and 470 deletions

View File

@@ -1,7 +1,7 @@
<th:block th:fragment="langs">
<a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="bg_BG">
<img src="images/flags/bg.svg" alt="icon" width="20" height="15"> Български
</a>
</a>
<a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="ar_AR">
<img src="images/flags/sa.svg" alt="icon" width="20" height="15"> العربية
</a>
@@ -56,4 +56,7 @@
<a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="ja_JP">
<img src="images/flags/jp.svg" alt="icon" width="20" height="15"> 日本語
</a>
<a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="el_GR">
<img src="images/flags/gr.svg" alt="icon" width="20" height="15"> Ελληνικά
</a>
</th:block>

View File

@@ -179,7 +179,7 @@ select#font-select, select#font-select option {
</div>
<div class="tab-container" th:title="#{sign.text}">
<label class="form-check-label" for="sigText" th:text="#{text}"></label>
<input type="text" class="form-control" id="sigText" name="sigText">
<textarea class="form-control" id="sigText" name="sigText" rows="3"></textarea>
<label th:text="#{font}"></label>
<select class="form-control" name="font" id="font-select">
<option th:each="font : ${fonts}"
@@ -188,7 +188,6 @@ select#font-select, select#font-select option {
th:class="${font.name.toLowerCase()+'-font'}">
</option>
</select>
<div class="margin-auto-parent">
<button id="save-text-signature" class="btn btn-outline-success mt-2 margin-center" onclick="addDraggableFromText()" th:text="#{sign.add}"></button>
</div>
@@ -204,10 +203,20 @@ select#font-select, select#font-select option {
const textWidth = ctx.measureText(sigText).width;
const textHeight = fontSize;
let paragraphs = sigText.split(/\r?\n/);
canvas.width = textWidth;
canvas.height = textHeight*1.35; //for tails
canvas.height = paragraphs.length * textHeight*1.35; //for tails
ctx.font = `${fontSize}px ${font}`;
ctx.fillText(sigText, 0, fontSize);
ctx.textBaseline = 'top';
let y = 0;
paragraphs.forEach(paragraph => {
ctx.fillText(paragraph, 0, y);
y += fontSize;
});
const dataURL = canvas.toDataURL();
DraggableUtils.createDraggableCanvasFromUrl(dataURL);