From 1fd763c7372351dc4f5da1f6fabfd6287fd32694 Mon Sep 17 00:00:00 2001
From: Zach Rispoli <zach.rispoli@gmail.com>
Date: Thu, 5 Jan 2017 18:32:15 -0500
Subject: [PATCH] broken fill bucket kind of working

---
 resources/ellipse.png                      | Bin 1759 -> 2092 bytes
 resources/eraser.png                       | Bin 680 -> 805 bytes
 resources/eyedropper.png                   | Bin 2205 -> 1483 bytes
 resources/fill-bucket.png                  | Bin 1971 -> 2178 bytes
 resources/paintbrush.png                   | Bin 1067 -> 1316 bytes
 resources/rectangle.png                    | Bin 438 -> 409 bytes
 src/editor/Interfaces.Fabric.js            |   4 +-
 src/editor/Interfaces.Paper.js             | 117 ++++++++++++++++++++-
 src/editor/Interfaces.Properties.js        |   4 +-
 src/editor/Tools.Ellipse.js                |   1 +
 src/editor/Tools.FillBucket.js             |  13 ++-
 src/editor/Tools.Paintbrush.js             |   1 +
 src/editor/Tools.Rectangle.js              |   1 +
 src/editor/WickEditor.WickActionHandler.js |  16 ++-
 14 files changed, 147 insertions(+), 10 deletions(-)

diff --git a/resources/ellipse.png b/resources/ellipse.png
index f757017069ef9d3460fec083bf5e2e619cdd2cf3..336de667d935105deb07d650e6c6f7eb62856849 100644
GIT binary patch
delta 2053
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

delta 1718
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
M07*qoM6N<$g5k9=(EtDd

diff --git a/resources/eraser.png b/resources/eraser.png
index 3b65d4ef3ae744cd9d1578e5c1ccb64058a47169..849c4126be4b168d81424925018dc77f980bbbe7 100644
GIT binary patch
delta 793
zcmV+!1Lpjw1*Ha%8Gi-<0063Kaozv`00v@9M??Vs0RI60puMM)00009a7bBm00060
z000600qA$beE<Le2XskIMF-&l1r-z@qB#IQ0008ANkl<Zc-rmTyK59d9Ki8!{KZEn
zA`<YC#78|~?;j8!h>g`WDQxV7RMs|HNk9-mu=@3ajg5HG7=Kcz&De+mv9qxd5+Mc>
zi|mQ<9@)pt-pp{nGRbB4`?<{BZf+OGGoI+iT6?gqZB0ZLehOFs=7Dd(W8kT(Zf6f*
zt(^fn!0dnDdIsDIg&>i~16%~AjWI8rb354q>=PdxK@x}$iXe%^2Sbn%#ZMRUXKOs%
zD}p2z?;SxBjDPovAc@9%Ly&~yy&y;n@n?$oa{)I~8$mLNZ-gM3#MefUjN)q{NM`Ys
z5yW%+=_3Ao1SgrL5G2$1(g>1qd?^IUJbqsUX&8SLSOG2&|MW#@1mK+8G{&3+E|JFc
zAT(YA&be2{m?NnoczF>_89^$p`AO&8c18%Fr9%8HuzzBVS#!><WrA=*D#Ul+>TVii
z-e-caE*0WuiZ4xOgm6zP#*-1kGO!>u;&VV)1}>}WhSZEt8R0E(MOD}P9tc&4PZ42H
zd=Eg4_>>TO;`abFh))6GO%cD*_jK4pe9Q;~;{n84I|aP+5FaDL(0G6Yz-^E5-8l?A
zx7N-L`hNjcy$jqQWqcQ4KF|(~5@D%Kd>7zjz-M6;2ur}#GVxu2M}gO2n+TQS0mM1?
z)fn>=m<x!|#tUQR_`h$1&bigZ5jsWuuc|vG|7<)}gxc{vhr$UWG>Y$gGL#U)Yv5Xw
z_`U#%Ab5!%2oO1fxA>s|ks@sQjE9n!%Uf&j0DlhyA24kKH&pfIko`EMs=s}1wDkP~
zu^{-K(jSb(vK&SRkSjv1TV`5Z4xK>1`xEd)Rln4}XQ(BFkh23^ul@0OOUohjU;pu@
zSBRvJ;N=RDlo1~Ix<X{t81n&`V)v5xiO9ph1B<|-_Z_v?9%J|4U@^}RRo!Ad<KYjO
X=Mqo3sb{J+00000NkvXXu0mjf@<L~;

literal 680
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!n2Vh}LpV4%Za?&Y0OWEOctjR6
zFfgqLVaENdFZ=@vN|v}rlmzFem6RtIr81P4m+NKbWfvzW7NqLs7p2dBXCnnvv^u~i
z#P$FG|3K!D0Q=tZivb;KQ4-`A%)rFL%Erab!^bZuE+H)=D<`j@>g3@QnU+&f*3i=4
z(>HJ3jy?PKA2@jE@cAn@Zr{0k@BV}5?|%HdQ&u;hfq_xm)5S3);_%h$C&Lao2(&(Q
z>Qv(6&^Twbs-ep{<lS%kncAM}A?4wvJ5S#I_H(~$kssTls+{Z7<oox{*Oz`-`(2pf
z7;p4^y+2=9I$d1OnKxf)P91~T!duy`Z{ySp_PRZ&-g%*tU8iaPbk2owN-e*42)s@{
zbW%D&P^H#m!q+;-TfbYHMH7VI1*RveJMJj>b?^1gxEa>9ee!!hJo@G#u+D35TtwQ_
zIBlKptM~dv7=R6Y@OtT?n)BCBxA@l2FkW7mc=@t!wVZI*ydo72e^-Cu7p&Wt8?R^$
z@-JB{s<k(&;>@;riCT>>Lz!-Cx3r)6Y$wchFHVD{YNEg!RVU+5vBKgjt{s|kcZ0r|
zO*H?SLsNPVb@d$LEmmdUyw&9YuI!EGi)&Tpe4PHH{u?)M<ZgzSZXqi`X~fgj&t;uc
GLK6UMxY`x~

diff --git a/resources/eyedropper.png b/resources/eyedropper.png
index f1c296c54de8c57fa6edc0f986e0070f79f1c270..759bb4dfe491d60446c698c5ad5a43ddb789a7a6 100644
GIT binary patch
delta 1465
zcmV;q1xEUv5z7mZB!32COGiWi{{a60|De66lK=n!32;bRa{vGV{r~_0{sHKB!+ih%
z00(qQO+^Rc0R<HkEK;cV?*IS=SV=@dRCwCmnr(<wRT#(r&%HD3vgQlf^rleA5P@kg
zmh9NNsr8|-5ZqOFn5ZC-!Di>qwJ&{%)-TaU&EB)hN=q+9yMIdLx~>+AVysJ%Mq;oO
z3DE~3e48*NBX^qf^uaO4**kOZ?7ZA__xU#W+&Sm`{^xnlea;KP$7UEtGk^^MHWJYy
zW?o1{SDE=IB03|b9P01yzf!Ia@+tT#051dB3}8V?IHJD*3<7x9vaE}~7a);HEYx-V
zqx`5>Viz<`>woO)>-)C2K=;w8uhlf|D1aws@b}x8`Nc>ia_QvBlc#+rfMFO(0DAz;
zuc8_qzzdN`<b0tB%7=hynr%|b@fr@+l%{FxZiWM?9`k`f;74X&T;r-Q5YZ!+WnI)%
z7C_haL>=G(;BIDq9RQRTfQVMtvHGp?czmw10>omm0Dm*L*0G8C&CShGWd#U@LXQEM
zQ_nV-d4;k9F!P!QG_zdgIbdxA+L))L0H$e%0jzF7Q<szzpu4+!k(BaSz2iS`=QPDe
zeqBD_zrR7B*<nvILBlXo09FC`6~LbWf&g9u@IV8*@mnU72?rVtpG+n@0lcq3686FH
z@Gxr)c7O3UBKk}L_$gi2KWTU>ETw!BK(hkVO;0+VzT9vDgb=*|c6bawn#p9|@oYon
z)TvYBt*xyDV2uaxXLVg)KR7se{pJIuSA(^l^@(UhI-R~+_^{yu7>3aU;H?HXdjP-+
z%d*Z+%LQgB{4W500B{DtX(7aklF5()@KXTJ0e=Wr*~DQ0pAyk{sWSl21SkhjM4L2C
z`!1Ku9S5*%hE42lZ*Na@bacpy(_s(cvqaQsS=K=S*uH&xXeJ^M(ST)Hug$c7nhNj$
zkWQyB>$?6lfXND)$mMdmx2x%+<^?=}O@;7Ph;V4<&Yiz2Cx8>Y5Mr#<e=8JWyxP8M
zDu2NjiXf$Y4!}PSug<HszX8?Y^Yt_X_|R$LL_`ae@c;+-&2HhhZQC{nz*hjCEh_rC
z_+4gxTnPbOz#ni^Pdpx<8w>`I09aR4v?G(rJPcre;TM32_Ep<=T@`r4Fct)Z!D9d-
z#qdIip2^8c84ia>TUuI{6VYM-okEDAYJdArb%fs{gcx;GPa=`HL)Z1A03Nl2FMJS-
z#e$(wXo=mzrlA7V3O<!e-Nnqu0W5WbuZL+~!gqIfFJk5sUct}E18O+(_c8O=0G4<K
zU$F-`z<0TYH%&9l%oAS2SL6Yu;ECv8X5J!%*zdBQ2LT)haIe?!u05bu@TO@l1AlNr
z6?j(y)DV6}{<hbhs=zyjfCGG&5Msoo2ekq?g6a4CJcTdo0kwiprBdxgbWBC~k{)21
z=0j4-$!g(E(|krsIR>CbMfj2)Af=4j!AmKl6}bI+Ddm?c!<P$zuHu!alrq}i-@nf#
z{6+wy0Gd>Ww-q3jO0Bd>P`;@EK7UF?pX0`*2c_X{1z_f=&3k)X!oLDwh?xU^fS)G7
z$jFEWU`uhDo6F_CZ~-3&@Ue}k%EC_*U}9q8DFF8rO@2pr?b`K+1AGd=Zkw-)((ra6
z5VZ-3Jr3}10O+$RQXU>C*cFb&VnF~MMdjDB+3Z+}1ZO3Ht<3zYU*T^NAb%7Jy~)hC
z7nL6z7#O&A^G7n7T&ihWl$oQ<yre{(zJdQg6D+gNe;zlsqr39q;dF56D|i5)GVs>{
zd=GbbcFzNNPY98Q&#c_ZP?H1v6#yfertNKOYa5@**}NY@pxFKfaFB@hHZ?UJ>Fw>E
zg3pbdmcMyB3}7gm&5jjLiZZjo$i*Ij?<TfN?3SZ3n@fzd8ope1*OT{#S#SRV%awIG
TXU#IT00000NkvXXu0mjflUTSB

literal 2205
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
C63f8=

diff --git a/resources/fill-bucket.png b/resources/fill-bucket.png
index 14e235abcd56dd0e161fe4b88f566bf734d82d88..f949b494ce7097d3a5de61bb145405806a7aaa6b 100644
GIT binary patch
delta 2165
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

delta 1957
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

diff --git a/resources/paintbrush.png b/resources/paintbrush.png
index c505c91d93dbb57b9ead81db4b68809499336f41..d958cbf3f69c57b7f7bcd828e9d5d94ef768af80 100755
GIT binary patch
delta 1287
zcmV+i1^D`_2&4*-85#xv0063Kaozv`00v@9M??Vs0RI60puMM)kuVs42XskIMF-&l
z1r-xEugVUU000EBNkl<Zc-q~XTZmOv7{`D6oI{b8QK=Y3Ir$i9`ymOWX0pOAmfGDk
z)Nkma`<<d<dZ~vVj3`SX`e?EnN~BIGk<>)=(nBlMq8>)4Nh?T^E)*H#^l;XZJ!keg
zvoC9(z4v@D53^Z&t@HbT^Iz-x)>_-6pdljDfM<bKz#!14s{37!;}sZw09YJ&{1edQ
zS_H2o@QoM&E>+bLSL0Pm1P^c?@UqJ>D<y(&#DXa|1!BMhYys8*=L6rX>R72A5EC9?
zE^q|+4){hy=9Sg~3E;!xpv?|Lr4qmqeCibGO#%2+B6w2-K3FGz^r-5ALJE*Ed{BgL
zRUIx=7U&RsqgWagk-3F&KnLN2aR9hbRsYG=0Xe|~bOCqfIt6lsZ^ZAp2~Ys|5nyMY
z4)`EPcz|A2{d2NLwG4m2Mk~NcIlymH)!o*K=KwDNR{>uDkE-gAnL9vLcL28l$2tr@
z3_Nb(R|ET~AFIuO25tgA7m+UKX;4JGu&t?x+yHFtkQ2s$D}Zl-O~8sa>%--$y5DmI
zKMmLh^sDMSIg0Qq@R^-{vm)#wyQ>aY`zwKEzV8niWA+By7-N3$eSeR&U^OH7qxP>4
zm>!}13}B|`2tK&lj{<9Qc0$xRRCNsBSXlFPLac1zC4@hJ1^8%^JYRGtd<tBjG!5Pr
zp~$HM{UWleKq+z@ysG}4RDdNB+Z9oS6YyyYp{+667D<G0@M#3t47^=35hlQsbR{;%
zjQPI59k_t#H#K=?hfsLZ3>FZftKcHEgeUDlR)ihYuc<C7pa^Z@aWRM$VE~v1%rB4#
zlft{+4W34S{l4zp7_VhjEJcFH<y<qy9P@p@W)B|7(Fu{^vp5h*^5urh6d4OX3jt;(
ze9wglvEj22U}cJT(}<7=-l+g0@*J=zWj9GgNDS{J3y8?+z>9!5bW+spkP1F^77&qZ
zfn7ki<Ea!SJDdS5PXnLW0U~lH@DdU3-m-FntEeV_fL}rV%4reVM@uKT3NHruEMNn0
zYl3mU1l|J<Q@_7|z*WWA5dlQxcHotSdH#7-eI}%AehpY1qn}TJC27A4j3t1GoNa&T
z@`U}Xs`j?%y8^rctj(grOI-(u$QtTbOiAGn0*|y&<~Yy`yp<Pxr~^b~4xqp_Df_-o
zRd+^zm|hj&%@!FYQ}_uE5Ro3hIDp?A1wP<}wM;x?%p88403z}jup5|@vd>?Ehhi=i
z4H4Ga6#F2sG;8=1Q$R!(TX+`-BsZ$+hm<5d5jhpuOZ_YCw6R51Z=*y}0qzcg|JN=|
z7Xw#QzXzNw{~iYJqhwJ77KS`uuc}W6{{L8iL<WGRZTh-jRevj+02RP*dUhOmJ*4f1
zHvMc<)%Pi3RDiRZp8W^>5z_WZi$0D5_fXQP0DGFAo!p{4y|+al53A}gWfh=i3!lrH
zo<AWX*oANg_3r_~&ii($YCk283h=JoZU$pEupams7y_QM&S)-pgpx<q7<0(?{pl@Y
z4mfHpilb3rnX2w9y8w++xDWU`;yYu&ld3w%6o@K-F=o{F{eJ2vt(UafCJzHQXL&}~
x@lrTsd%6&~!`27$ZTd67SHMP9{fj9S{{u^iJhJ1`qc;Em002ovPDHLkV1k<-M4A8q

literal 1067
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!n2Vh}LpV4%Za?&Y0OWEOctjR6
zFfjfDVa6Bbhiid?k|nMYCBgY=CFO}lsSM@i<$9TU*~Q6;1*v-ZMd`EO*+>CZD+Kt2
zxc>kDAE<s5;0l3v|I<8xa`7cWe!&ckOw8<@Ts*w|LZV_4lG1YW3W`d~nkHrrj!rJ_
zUVeeW;Std>@d;_!c||3qEv=msrc9qZf8nCVOIEI4vu^!{&0Du^-?jJPk&|aH-nn=G
z!NW(7pFDs0>h-(#-+%o4^Y>rqzgrU+7?^}ST^vIq4lliSJxIxsq4lBiYUU)jGuckp
zdmc$e7(Cx{f{D%L%bx$yZ;mz?8T+=s+_!ked;J$7ycxXe!RJ&3>ny@m{;R&ViImy$
z`AO%}^n;g--}jW=sJOT9W8INMlU2Nx%kCAJvff*v@Fk`2#<|HyTjr|E3zyCNb366<
zNm1|fQ<mx<6KUk$`P~1i{fye_zhn~>zL!{tYzydk6h8II;tKcD6<qTt?{)88DeyMy
zc~M~C58MBLO3fxO`nmoz_j+|*`JzK#SL?qzqvE+qC$9dl)3MjPXZ?2HUhuSnIXnLT
z3(-Gv=_Xn%Hq$bLII8~qNDdIFP?&U8kHc2r=5?JdA01NsS6{fsEI7AvLWM$Dkk}GA
zkKn+7iX|HQD{R6vbv11BG_+UzO-nc%#qD)}ul5bo`>adnYjS?i-CVHn!^fQ6ldo%N
z9E(}{_vUqtFHdYArI}9En<*j|XHzH4khJ#sqo7}IZ|uMQdvy1}%_-;qUt0a%^v2u$
z@=Nx;zhj?j{Lk9!l{(Yp`Csqz2kj61{@d$L@nyaFYfs(_37+3*I=}f~hZvJx{-e9E
zmv1vStG)F{Ro~XFk$KV`riROI2?tL+ZhYd-#IP*3KId7WYGgO_ff>L5y)fsAnf%0x
zVaM*WlNXX_tIWUlxO1(P=e*ffJ-ctO`1UYwq1|H!qqXUEhwd!?{O&jF&PId9#+NO4
nS~Xi_9^bxxwY|B-q~|aHzLl0<Jwb9CL5bAU)z4*}Q$iB}NCIw=

diff --git a/resources/rectangle.png b/resources/rectangle.png
index b44218cb7de83bd8c1b8b71f4df360604b0612ab..6c74649d91d7c48644e0daf2faa82099786cf971 100644
GIT binary patch
delta 313
zcmV-90mlBe1DOMmJ%0iI000600qA$beE<Le2XskIMF-&l1r-%4?UD6d0003dNkl<Z
zc-rmTF-in66o>I|b_Q9s(as~-$QIs0Ynyk1#YQ}dmyq1T+DgP?Zz0&}BCfN|6x+xS
z&J+{!{UKcl$&ZlN<W&)I3tR&=&{9r*fX4>71g<DEuQT8a*i007_-|l6qwok&IzZE7
zPMdLcsJbx-;G=se+nq(HoZWpM11CcP9)Ks{w~y$A0BYa{xEl)amQs4o@%~4|#Tbv^
zQAAW39=-<VRsoYi0UeV-0T*5PGoLA??D_>#N*iFkZ(g6@;){rQC(rNl=VJie155I4
zm>3Lj%AT%^38xwZAct#j6%asx{{tL$C8M+)0P_ZT0nRA1eSWnCMyM_@_?%Ng00000
LNkvXXu0mjfFP?>v

delta 359
zcmbQqyp4H+Z9TUz0|U1(Bg3pY5)2Fs>?NMQuIvxEc-fe(x}UYr1q#V#hD4M&=jZ08
z=9K`s3=Gaisfi`2DGKG8B^e6tp1uJoda3LT42)8qE{-7;x8B}1%sXTt(e}_>#p!}x
z$zu+kj>hN<JIftn1=L@v?qDlk&ShA@tzy<8V4@=_Q6D8Zk!Rzdx*#*{BDv%L#Q$@C
z;M~Kk86e=VcR-7I*?}I5%`X|$A4oksKEH8~^AkaZvW7K>W+**)HDQXsZi91WfLOVH
zZt=V4Ke>2bG1V|;KiJ-t(ajL_fH~p{>kX#+jd_iQ!tD>d8CL%b4_c5eD&WAt$bw8v
zR$!EwEXT+m(NJHka;C0PdxE`G$kS~<SZ)YEEBzTL%;25iw}V%BE91S23#AtysrWLq
ye7GIW$|CTfvY{^0D9Ky=Md|^51C?{%e%|FZRZ<qo+;q?b6iS}1elF{r5}E*!Hi9Ss

diff --git a/src/editor/Interfaces.Fabric.js b/src/editor/Interfaces.Fabric.js
index ef48a08f..3c462611 100755
--- a/src/editor/Interfaces.Fabric.js
+++ b/src/editor/Interfaces.Fabric.js
@@ -159,7 +159,7 @@ var FabricInterface = function (wickEditor) {
         wickEditor.syncInterfaces();
 
         if(that.lastTool instanceof Tools.Paintbrush) {
-            //wickEditor.paper.updateTouchingPaths();
+            wickEditor.paper.onPathsNeedCleanup();
         }
     }
 
@@ -471,7 +471,7 @@ var FabricInterface = function (wickEditor) {
     this.forceModifySelectedObjects = function () {
         var wickObj = that.getSelectedObject(WickObject);
         if(wickObj && wickObj.fontData) {
-            that.modifyObjects(wickObj);
+            that.modifyObjects([wickObj]);
         }
         wickEditor.syncInterfaces();
     }
diff --git a/src/editor/Interfaces.Paper.js b/src/editor/Interfaces.Paper.js
index cff0a299..34e8685e 100644
--- a/src/editor/Interfaces.Paper.js
+++ b/src/editor/Interfaces.Paper.js
@@ -288,9 +288,13 @@ var PaperInterface = function (wickEditor) {
     // Update the paper canvas accordingly.
     self.onWickObjectsChange = function () {
         
+        // Generate a list of all wickobjects in the currentframe.
+        // ALWAYS do this or you'll be modifying a list while forEaching through it (this is bad)
         var currentFrame = wickEditor.project.currentObject.getCurrentFrame();
         var wickObjects = [];
-        currentFrame.wickObjects.forEach(function (wickObject) { wickObjects.push(wickObject); });
+        if(currentFrame) {
+            currentFrame.wickObjects.forEach(function (wickObject) { wickObjects.push(wickObject); });
+        }
         
          // For each wickobject in the current frame:
         wickObjects.forEach(function (wickObject) {
@@ -306,23 +310,57 @@ var PaperInterface = function (wickEditor) {
                 var group = paper.project.importSVG(doc);
 
                 group.children.forEach(function (child) {
+                    // Convert all paper.Shapes into paper.Paths (Paths have boolean ops, Shapes do not)
                     if(child instanceof paper.Shape) {
                         child.remove();
                         group.addChild(child.toPath());
                     }
 
+                    // Boolean ops only work with closed paths (potrace generates open paths for some reason)
                     if(child.closePath) child.closePath();
                 });
 
                 group.position = new paper.Point(wickObject.x, wickObject.y);
 
+                // Newly drawn paths need to get checked for intersections on next onPathsNeedCleanup
+                if(wickObject.isNewDrawingPath) {
+                    group.needsIntersectCheck = true;
+                    wickObjects.isNewDrawingPath = undefined;
+                }
+
                 paperObjectMappings[wickObject.uuid] = group;
 
             // If there is, update the path's position/scale/rotation.
             } else {
                 
                 var path = paperObjectMappings[wickObject.uuid];
-                path.position = new paper.Point(wickObject.x, wickObject.y);
+                
+                path.applyMatrix = true;
+                path.position.x = wickObject.x;
+                path.position.y = wickObject.y;
+
+                if(path.origRotation === undefined) path.origRotation = 0;
+                var newRotation = wickObject.angle;
+                if(newRotation !== path.origRotation) {
+                    path.rotate(newRotation-path.origRotation);
+                    wickObject.parentObject.removeChild(wickObject);
+                    self.onPaperCanvasChange();
+                    wickEditor.syncInterfaces();
+                }
+
+                if(path.origScaleX === undefined) path.origScaleX = 1;
+                var newScaleX = wickObject.scaleX;
+                if(newScaleX !== path.origScaleX) {
+                    path.scaling.x = newScaleX*path.origScaleX;
+                    path.origScaleX = wickObject.scaleX;
+                }
+
+                if(path.origScaleY === undefined) path.origScaleY = 1;
+                var newScaleY = wickObject.scaleY;
+                if(newScaleY !== path.origScaleY) {
+                    path.scaling.y = newScaleY*path.origScaleY;
+                    path.origScaleY = wickObject.scaleY;
+                }
                 
             }
         });
@@ -474,6 +512,81 @@ var PaperInterface = function (wickEditor) {
         
     }
 
+    self.onFill = function (x,y) {
+
+        var point = new paper.Point(x,y);
+
+        // Try to find a path to fill
+        var pathFilled = false;
+        var paths = getAllPathsInCanvas();
+        paths.forEach(function (path) {
+            if(pathFilled) return;
+
+            if(path.contains(point)) {
+                console.log("Path filled:")
+                console.log(path);
+
+                pathFilled = true;
+            }
+        });
+
+        // No path filled, try to find a hole to fill
+        var holeFilled = false;
+        if(!pathFilled) {
+            console.log("No path filled, looking for holes now");
+
+            // Unite all on-screen paths 
+            var allPathsUnion = undefined;
+            var paths = getAllPathsInCanvas();
+            paths.forEach(function (path) {
+                var clone = path.clone({insert:false});
+
+                if(!allPathsUnion) {
+                    allPathsUnion = clone.children[0];
+                } else {
+                    allPathsUnion = allPathsUnion.unite(clone.children[0]);
+                }
+            });
+
+            if(!allPathsUnion) return;
+
+            // Subtract union of all paths from huge rectangle
+            var hugeRectangle = new paper.Path.Rectangle(new paper.Point(-1000,-1000), new paper.Size(2000,2000));
+            var negativeSpace = hugeRectangle.subtract(allPathsUnion);
+            hugeRectangle.remove();
+            negativeSpace.remove();
+
+            //console.log(allPathsUnion);
+            //console.log(negativeSpace);
+            //console.log(allPathsUnion.exportSVG({insert:false}))
+            //console.log(negativeSpace.exportSVG({insert:false}))
+
+            negativeSpace.children.forEach(function (child) {
+                if(holeFilled) return;
+                if(child.clockwise && child.area !== 4000000 && child.contains(point)) {
+                    var clone = child.clone({insert:false});//.intersect(negativeSpace);
+                    var group = new paper.Group();
+                    group.addChild(clone);
+                    clone.clockwise = false;
+                    clone.fillColor = 'green';
+                    group.fillRule = 'evenodd';
+                    holeFilled = true;
+                }
+            });
+        }
+
+        if (pathFilled || holeFilled) {
+            /*getAllPathsInCanvas().forEach(function (path) {
+                path.children.forEach(function (child) {
+                    if(child instanceof paper.Path) console.log(child.style);
+                })
+            });*/
+
+            self.onPaperCanvasChange();
+            wickEditor.syncInterfaces();
+        }
+    }
+
     self.setPathNeedsIntersectionCheck = function (wickObject) {
         var path = paperObjectMappings[wickObject.uuid];
         if (path) path.needsIntersectCheck = true;
diff --git a/src/editor/Interfaces.Properties.js b/src/editor/Interfaces.Properties.js
index 00245095..b9f24bcf 100755
--- a/src/editor/Interfaces.Properties.js
+++ b/src/editor/Interfaces.Properties.js
@@ -264,7 +264,7 @@ var PropertiesInterface = function (wickEditor) {
         var newWeight = this.checked ? "bold" : "normal";
         wickEditor.fabric.forceModifySelectedObjects();
         wickEditor.actionHandler.doAction('modifyObjects', { 
-            ids: [wickEditor.fabric.getSelectedObject()], 
+            objs: [wickEditor.fabric.getSelectedObject()], 
             modifiedStates: [{ fontWeight : newWeight }] 
         });
     };
@@ -272,7 +272,7 @@ var PropertiesInterface = function (wickEditor) {
         var newStyle = this.checked ? "italic" : "normal";
         wickEditor.fabric.forceModifySelectedObjects();
         wickEditor.actionHandler.doAction('modifyObjects', { 
-            ids: [wickEditor.fabric.getSelectedObject()], 
+            objs: [wickEditor.fabric.getSelectedObject()], 
             modifiedStates: [{ fontStyle : newStyle }] 
         });
     };
diff --git a/src/editor/Tools.Ellipse.js b/src/editor/Tools.Ellipse.js
index 65dc088d..a08f5035 100644
--- a/src/editor/Tools.Ellipse.js
+++ b/src/editor/Tools.Ellipse.js
@@ -33,6 +33,7 @@ Tools.Ellipse = function (wickEditor) {
         WickObject.fromPathFile(svgData, function (wickObject) {
             wickObject.x = origX;
             wickObject.y = origY;
+            wickObject.isNewDrawingPath = true;
             wickEditor.project.addObject(wickObject);
             wickEditor.paper.onWickObjectsChange();
         });
diff --git a/src/editor/Tools.FillBucket.js b/src/editor/Tools.FillBucket.js
index cda4efa6..a146e664 100644
--- a/src/editor/Tools.FillBucket.js
+++ b/src/editor/Tools.FillBucket.js
@@ -16,7 +16,16 @@ Tools.FillBucket = function (wickEditor) {
         if(e.e.button != 0) return;
         if(!(wickEditor.fabric.currentTool instanceof Tools.FillBucket)) return;
 
-        var onscreenObjects = wickEditor.project.currentObject.getAllActiveChildObjects();
+        var mouseScreenSpace = wickEditor.fabric.screenToCanvasSpace(e.e.offsetX, e.e.offsetY);
+        var mousePointX = mouseScreenSpace.x;
+        var mousePointY = mouseScreenSpace.y;
+        var insideSymbolOffset = wickEditor.project.currentObject.getAbsolutePosition();
+        mousePointX -= insideSymbolOffset.x;
+        mousePointY -= insideSymbolOffset.y;
+
+        wickEditor.paper.onFill(mousePointX, mousePointY);
+
+        /*var onscreenObjects = wickEditor.project.currentObject.getAllActiveChildObjects();
         VectorToolUtils.updatePaperDataOnVectorWickObjects(onscreenObjects);
 
         var mouseScreenSpace = wickEditor.fabric.screenToCanvasSpace(e.e.offsetX, e.e.offsetY);
@@ -119,7 +128,7 @@ Tools.FillBucket = function (wickEditor) {
                 wickObjects: [holeWickObj],
                 partOfChain: true
             });
-        });
+        });*/
     });
 
 }
\ No newline at end of file
diff --git a/src/editor/Tools.Paintbrush.js b/src/editor/Tools.Paintbrush.js
index 6387e0b0..4f564e35 100644
--- a/src/editor/Tools.Paintbrush.js
+++ b/src/editor/Tools.Paintbrush.js
@@ -59,6 +59,7 @@ Tools.Paintbrush = function (wickEditor) {
             WickObject.fromPathFile(SVGData, function (wickObject) {
                 wickObject.x = fabricPath.left;
                 wickObject.y = fabricPath.top;
+                wickObject.isNewDrawingPath = true;
                 wickEditor.project.addObject(wickObject);
                 wickEditor.paper.onWickObjectsChange();
             });
diff --git a/src/editor/Tools.Rectangle.js b/src/editor/Tools.Rectangle.js
index d0680642..cb053f90 100644
--- a/src/editor/Tools.Rectangle.js
+++ b/src/editor/Tools.Rectangle.js
@@ -29,6 +29,7 @@ Tools.Rectangle = function (wickEditor) {
         WickObject.fromPathFile(svgString, function (wickObject) {
             wickObject.x = origX;
             wickObject.y = origY;
+            wickObject.isNewDrawingPath = true;
             wickEditor.project.addObject(wickObject);
             wickEditor.paper.onWickObjectsChange();
         });
diff --git a/src/editor/WickEditor.WickActionHandler.js b/src/editor/WickEditor.WickActionHandler.js
index 046a5ec7..22044748 100755
--- a/src/editor/WickEditor.WickActionHandler.js
+++ b/src/editor/WickEditor.WickActionHandler.js
@@ -7,10 +7,14 @@
 
 var WickActionHandler = function (wickEditor) {
 
+    var self = this;
+
     /* WickAction definition. All user actions are expected to be well defined by
    this structure in order to properly be done and undone. */
 
-    var WickAction = function (doAction, undoAction) {
+    var WickAction = function (name, doAction, undoAction) {
+
+        this.name = name;
 
         /* To be called when an action is committed by the user. */
         this.doAction = doAction;
@@ -47,6 +51,7 @@ var WickActionHandler = function (wickEditor) {
 
         // Create a new WickAction object
         var action = new WickAction(
+            actionName,
             this.doActions[actionName],
             this.undoActions[actionName]
         );
@@ -120,6 +125,13 @@ var WickActionHandler = function (wickEditor) {
         this.redoStack = [];
     }
 
+    this.printHistory = function () {
+        this.undoStack.forEach(function (action) {
+            console.log("Action " + self.undoStack.indexOf(action) + ":")
+            console.log(action.name);
+        })
+    }
+
 // Register all actions
 
     this.registerAction('addObjects',
@@ -278,7 +290,7 @@ var WickActionHandler = function (wickEditor) {
             
             selectedObjects.forEach(function (obj) {
                 wickEditor.project.currentObject.removeChild(obj);
-                if(obj.pathData) wickEditor.paper.updatePaperSceneForObject(obj, true);
+                //if(obj.pathData) wickEditor.paper.updatePaperSceneForObject(obj, true);
                 obj.inFrameSVG = false;
             });