Skip to content

Commit c433c0a

Browse files
committed
Fixed quietZoneColor issue
Fixed `quietZoneColor` issue
1 parent 5946a92 commit c433c0a

File tree

3 files changed

+21
-22
lines changed

3 files changed

+21
-22
lines changed

QRCode.js

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* React Native QRCode generation component. Can generate standard QRCode image or base64 image data url text. Cross-browser QRCode generator for pure javascript. Support Dot style, Logo, Background image, Colorful, Title etc. settings. support binary mode.
55
*
6-
* Version 3.9.0
6+
* Version 3.9.1
77
*
88
* @author [ [email protected] ]
99
*
@@ -1107,18 +1107,21 @@ Drawing.prototype.draw = function(oQRCode) {
11071107
var t = this;
11081108

11091109
function drawQuietZoneColor() {
1110-
// top
1111-
_oContext.lineWidth = 0;
1112-
_oContext.fillStyle = _htOption.quietZoneColor;
1113-
1114-
_oContext.fillRect(0, 0, t._canvas.width, _htOption.quietZone);
1115-
// left
1116-
_oContext.fillRect(0, _htOption.quietZone, _htOption.quietZone, t._canvas.height - _htOption.quietZone * 2);
1117-
// right
1118-
_oContext.fillRect(t._canvas.width - _htOption.quietZone, _htOption.quietZone, _htOption.quietZone, t._canvas
1119-
.height - _htOption.quietZone * 2);
1120-
// bottom
1121-
_oContext.fillRect(0, t._canvas.height - _htOption.quietZone, t._canvas.width, _htOption.quietZone);
1110+
if (_htOption.quietZone > 0 && _htOption.quietZoneColor) {
1111+
// top
1112+
_oContext.lineWidth = 0;
1113+
_oContext.fillStyle = _htOption.quietZoneColor;
1114+
1115+
_oContext.fillRect(0, 0, t._canvas.width, _htOption.quietZone);
1116+
// left
1117+
_oContext.fillRect(0, _htOption.quietZone, _htOption.quietZone, t._canvas.height - _htOption.quietZone *
1118+
2);
1119+
// right
1120+
_oContext.fillRect(t._canvas.width - _htOption.quietZone, _htOption.quietZone, _htOption.quietZone, t._canvas
1121+
.height - _htOption.quietZone * 2);
1122+
// bottom
1123+
_oContext.fillRect(0, t._canvas.height - _htOption.quietZone, t._canvas.width, _htOption.quietZone);
1124+
}
11221125
}
11231126

11241127
if (_htOption.backgroundImage) {
@@ -1333,9 +1336,7 @@ Drawing.prototype.draw = function(oQRCode) {
13331336

13341337
_this._bIsPainted = true;
13351338

1336-
if (_htOption.quietZone > 0 && _htOption.quietZoneColor) {
1337-
drawQuietZoneColor();
1338-
}
1339+
drawQuietZoneColor();
13391340
if (_htOption.onRenderingEnd) {
13401341
_htOption.onRenderingEnd(_htOption, function() {
13411342
return _this._canvas.toDataURL();
@@ -1352,10 +1353,8 @@ Drawing.prototype.draw = function(oQRCode) {
13521353

13531354
logoImg.src = _htOption.logo;
13541355
} else {
1356+
drawQuietZoneColor();
13551357
this._bIsPainted = true;
1356-
if (_htOption.quietZone > 0 && _htOption.quietZoneColor) {
1357-
drawQuietZoneColor();
1358-
}
13591358

13601359
if (_htOption.onRenderingEnd) {
13611360
_htOption.onRenderingEnd(_htOption, function() {

0 commit comments

Comments
 (0)