From f1ef9fcfdc283a0e2a2883b9f5735421f537e38f Mon Sep 17 00:00:00 2001 From: anapnoe <124302297+anapnoe@users.noreply.github.com> Date: Tue, 2 May 2023 09:32:39 +0300 Subject: [PATCH] fix img2ing inpaint observer not to dispatch change when drawing --- anapnoe.ico | Bin 4286 -> 0 bytes javascript/imageMaskFix.js | 22 +++++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) delete mode 100644 anapnoe.ico diff --git a/anapnoe.ico b/anapnoe.ico deleted file mode 100644 index 0bdafb82b16fb3baa0b55c7d1ecaefeaf68424d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4286 zcmdUx+mBsS9LM*xTH?|fD!nN75Cjp4`z;*$Ag)EwQo=(;BqU8;(}+wPVGz3UfEPqG z)I%>qixj;KGcVP;mNy;q56pR+hm$!zpPjXKmgCGhqx!&}eCGGtzx7?ewSH@_wPv!c zhoAob%-`9DzAT%UW!afPD7zYrmk(|K$EVqBW`V=7CqWJFg@*(BH8>H}l=^>LYs`b4 z3(Mgn_#XDb4)`RXZ_G9|cf)aT(DMj=563QpA=m@Y!!@u7j)YkOePfGZ5Wa)muoTQO z?WIr~Sb%*C_QMmf5IWWq+k^H=tbN}Eb9LoJByXR#mJQdrqp5;S9tZy~>cEGVv4zCR?!+OTN zLt@Nx>>2+!*m&NjV`HDYl6>A>p3OUxm}AX^58%a?__@3v0Qb)$uyUHH-2%VEIS}j7 zz6|TZF=O1jV=r85%qMAk8s9Ti-e+ZF%dbRx1HOBw555N1yUdm3ypEV-Rr?$N3h?ec z8LI61;CUQ|RpGsAk4}hNgSzKH?YB_gJ1x4L_z!S7#5(=<-j_!ki%-&i55Ds|J#AN) zXr94;7QCO;x_7GD6YVj?zkzfQJjna!FdO3VrS%<-g3a(6%z(7bcJH|@kV66Pm%r4K zjPD)u1v~(8{@un`cNOf1E0cc4owN7KeNY3>_zI}%ivNqi`CyUS~sV9(AsNbr0dY7u*v$RQl904rhS6<>B32pMvM( zC2)SO|0}RJ_^sc|zisBY6k-hv@zq~%tlg7nAH#QV&jJ7KC?W&e1ho7h@gfa6Fn_usUk7kHZG|+n$Sg678$_??JgPN!+=+2D!0zkMV%o zpWrO;8~+T(%JvR@`_b%!+fr@t`>=jT&vCarN1(CZx8WW55RA1OI?h=;0NbG#Dy@Ft zR_w2ES&UVp;KVrg5*Q6!9OE7I?s0Q3X{QY__ln=g?_1u*##~iNk8AF| zwh-8I~fgC!{gZ4OXKmJ;fub}r^-3;zo?=0^(@0U}- zJ?x$rePgz%QEMOHr~KaOc_oXoO;Mm|xS7?{k*`KF_s?XhNaWH`%K z$hs_BRpbZiMZU9M6uauh;M#gI(o-*nvU>3cZR1cc>LU~Rn2a@QBcqMl;P~V~??kPU PH+siwj^SA4m<;_Vx=CC- diff --git a/javascript/imageMaskFix.js b/javascript/imageMaskFix.js index 75e07b21..78f4d0ac 100644 --- a/javascript/imageMaskFix.js +++ b/javascript/imageMaskFix.js @@ -46,12 +46,12 @@ function imageMaskResize() { onUiUpdate(() => imageMaskResize()); */ - + onUiLoaded(function(){ const color_box = ''; const brush_size = ''; - + let is_drawing = false; let img_src = []; let spl_instances = []; let spl_pan_instances = []; @@ -60,9 +60,17 @@ onUiLoaded(function(){ gradioApp().querySelectorAll('div[data-testid="image"]').forEach(function (elem, i){ let img_parent = elem.parentElement.querySelector('div[data-testid="image"] > div'); let img = img_parent.querySelector('img'); - if(img){ + if(img && !is_drawing){ if(img_src[i] != img.src){ let tool_buttons = img_parent.querySelectorAll('button'); + + + + + if(is_drawing){ + return; + } + //console.log(); //console.log(tool_buttons); if(tool_buttons.length > 2){ let spl_parent = elem.parentElement; @@ -222,6 +230,14 @@ onUiLoaded(function(){ spl.panzoom(false); setTimeout(function() { init_drawing_tools(); }, 500); + img.addEventListener('mouseout', function(e){ + is_drawing = false; + }) + img.addEventListener('mouseover', function(e){ + is_drawing = true; + + }) + } } }