From c77ce6aa54758bc6fffad5f6595fe8c3f8b9adf2 Mon Sep 17 00:00:00 2001 From: viliusle Date: Thu, 11 Mar 2021 18:15:33 +0200 Subject: [PATCH] fixed color #ffffffff handling (last commit was wrong) --- src/js/actions/insert-layer.js | 2 +- src/js/libs/helpers.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/js/actions/insert-layer.js b/src/js/actions/insert-layer.js index 9c56e48..2fe4eea 100644 --- a/src/js/actions/insert-layer.js +++ b/src/js/actions/insert-layer.js @@ -96,7 +96,7 @@ export class Insert_layer_action extends Base_action { }; layer.data = null; autoresize_as = [config.layer.width, config.layer.height, null, true, true]; - need_autoresize = true; + //need_autoresize = true; } else if (typeof layer.data == 'string') { image_load_promise = new Promise((resolve, reject) => { diff --git a/src/js/libs/helpers.js b/src/js/libs/helpers.js index cfbe0c8..8b43f24 100644 --- a/src/js/libs/helpers.js +++ b/src/js/libs/helpers.js @@ -176,11 +176,11 @@ class Helper_class { for (var i = 0; i < 3; i++) hex += temp[i] + temp[i]; } - var triplets = /^([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})$/i.exec(hex).slice(1); + var triplets = /^([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/i.exec(hex).slice(1); return { - r: parseInt(triplets[1], 16), - g: parseInt(triplets[2], 16), - b: parseInt(triplets[3], 16), + r: parseInt(triplets[0], 16), + g: parseInt(triplets[1], 16), + b: parseInt(triplets[2], 16), a: 255 }; }