From 12bd919cc3405b8a8ecfc7c8c624183862339203 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Wed, 21 Oct 2020 15:49:12 +0200
Subject: [PATCH] Don't hardcode the clip border width
---
packages/qr-code-scanner/src/qr-code-scanner.js | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/packages/qr-code-scanner/src/qr-code-scanner.js b/packages/qr-code-scanner/src/qr-code-scanner.js
index 2e338eb4..191430dd 100644
--- a/packages/qr-code-scanner/src/qr-code-scanner.js
+++ b/packages/qr-code-scanner/src/qr-code-scanner.js
@@ -296,15 +296,16 @@ export class QrCodeScanner extends ScopedElementsMixin(DBPLitElement) {
else
canvas.fillStyle = 'white';
+ let borderWidth = Math.max(maskWidth, maskHeight) / 50;
canvas.moveTo(maskStartX,maskStartY);
- canvas.rect(maskStartX, maskStartY, maskWidth/3, 10);
- canvas.rect(maskStartX, maskStartY, 10, maskHeight/3);
- canvas.rect(maskStartX + maskWidth/3*2, maskStartY, maskWidth/3, 10);
- canvas.rect(maskStartX + maskWidth - 10, maskStartY, 10, maskHeight/3);
- canvas.rect(maskStartX, maskStartY + maskHeight -10, maskWidth/3, 10);
- canvas.rect(maskStartX, maskStartY + maskHeight/3*2, 10, maskHeight/3);
- canvas.rect(maskStartX + maskWidth/3*2, maskStartY + maskHeight -10, maskWidth/3, 10);
- canvas.rect(maskStartX + maskWidth - 10, maskStartY + maskHeight/3*2, 10, maskHeight/3);
+ canvas.rect(maskStartX, maskStartY, maskWidth/3, borderWidth);
+ canvas.rect(maskStartX, maskStartY, borderWidth, maskHeight/3);
+ canvas.rect(maskStartX + maskWidth/3*2, maskStartY, maskWidth/3, borderWidth);
+ canvas.rect(maskStartX + maskWidth - borderWidth, maskStartY, borderWidth, maskHeight/3);
+ canvas.rect(maskStartX, maskStartY + maskHeight - borderWidth, maskWidth/3, borderWidth);
+ canvas.rect(maskStartX, maskStartY + maskHeight/3*2, borderWidth, maskHeight/3);
+ canvas.rect(maskStartX + maskWidth/3*2, maskStartY + maskHeight - borderWidth, maskWidth/3, borderWidth);
+ canvas.rect(maskStartX + maskWidth - borderWidth, maskStartY + maskHeight/3*2, borderWidth, maskHeight/3);
canvas.fill();
if (code) {
--
GitLab