From f4bf053564095e44e1b53f92b47bb9f075fbda63 Mon Sep 17 00:00:00 2001 From: epicabsol Date: Fri, 5 Aug 2016 20:33:18 -0700 Subject: [PATCH 1/4] Reworked circle drawing cursor Reworked circle drawing cursor to match the style of the rectangle cursor. --- src/img/cursors/circle.png | Bin 761 -> 766 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/img/cursors/circle.png b/src/img/cursors/circle.png index a186a26bbe4846ee539d230d7b0e722df019bf0e..eba463772a6f3cd05727b4ebd478e385c502ac69 100644 GIT binary patch delta 742 zcmV0aYMXst%AriS9i-PDuL4gayg+UfQ2!Dd!{!Y-t86P95j5@FX zp3`C`iyo^k94_~8&v(DeJs19Scz#c`bi^xxCRMh%M(T`F#NdcXrx9&Cvu{c4pMaK* zcq0%A*dB^(3(Er{N;aoVq+G@(T#RV=+=1%$KL9Nq@kXyjq^#JB?XeKmd>HbxDCvx0 zU^GKEr{UIcO@I3|prGAfUgE`TS%@g2ppq}l2dFA;YMj_`ijelyZ?Cxg-d7N43fLCD zLa{2S5kx7h^SQF@Yu02hK}9W@5<3$z3H-ZWjPQ zG<8~AG=JwJ8Di^#8wF9UnKG?C!S!jM2`Cl==B=qS(XtX;}P};EG0a!&mTFNpe#) z40ZKzD}Q;IsMg;BC;(_1pKwW~1yRK}_L7a29|+bpkR7}Vk|3L0MB>qNZu-yjerhqs zXxlX4?EX;96$uZ1%a9v-$trV=bZ#!=(Fi8}1*5A;^gQQw(Runt{J1XR8_o5xKU(>C zB-*&l*%>)_suSnlY2u$AP+GH=$uDsp22RkIsb9vp8ou7Va=MkRUjeP*n)YaHl5FpN zLQ7XM!x!S~<7af3V^Jqvea>}t;jhJi{f&D!muu~UAnWQX@RxYsP7aJT>~4J*|JQf^ Y4$M)BwJZJuO#lD@07*qoM6N<$f~Wdg&j0`b delta 737 zcmV<70v`ST1^ES#B!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0007; zNkl3fh{%XuQUCZW=l|iT_g(S)(VFnfSgCMdVdh9`>zo934 z4(g#I2p=32fwiDabYSag#pWiuX}ad7*>*Q~xBI=fb8J_1(SJ(^KAiLYe$VHe?>XP| zB`5ApGAM+Qa(xOEVop(%Ii@6F@6#;vx7Y!0aOm+raE+jb^)1{ho$V98%LjskZa}yJvS?N4kf*8mgy*$=J);W!p+B7Y4s6fV6W{wFHo%{tol;(erJCU~8$Y z6!&K0SfT+{7=L>`@BQ#K5deFK$d_tqZ?PC!M~B-6i;|2R`SPpEvO+N-`mCg~VkDl4 z!aBstvWyMsygkr-Oq66z`0dW6Ybh8@BRxo>63=nwezWUf334jAdP9a0D_hvki|T&R z;5ec&8Gp5g7gGyyAH*o);9&QKCzW!`a2pLDKwW-MIj8vBOGL6^*UZ}GU)V= zCWE0s>}LcxA8`cKx|rJTD;izB(`|QlIWL{ITYB2fRUTiA^Y|8H*ZW!=H5Hn~gfAM8 z2EPQwAHg@9{_&z(mO93DfPKhezkLN++LB!u37 z2frjBh2yLSz-}KXVfTO3T^u_}bjEXvn0~wA8U0+^#)-@VayXzw{g(eLzXccocR_wG TMq{CL00000NkvXXu0mjfWjSI_ From d795c297f57fdf589af7653aa9a7d39a0fdf6355 Mon Sep 17 00:00:00 2001 From: epicabsol Date: Fri, 5 Aug 2016 21:34:46 -0700 Subject: [PATCH 2/4] Lighting cursor, more tweaks Added an icon for the lighting tool, although it's somewhat difficult to see what it is without looking closely. I'd love to hear other ideas for a cursor. (See juliandescottes/piskel#351) I also reworked the hit point of the existing cursors by a few pixels. --- src/css/tools.css | 19 +++++++++++-------- src/img/cursors/lighting.png | Bin 0 -> 606 bytes 2 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 src/img/cursors/lighting.png diff --git a/src/css/tools.css b/src/css/tools.css index 0b13b42b..c79d2677 100644 --- a/src/css/tools.css +++ b/src/css/tools.css @@ -31,7 +31,7 @@ .tool-paint-bucket .drawing-canvas-container:hover, .tool-colorswap .drawing-canvas-container:hover { - cursor: url(../img/cursors/paint-bucket.png) 12 12, pointer; + cursor: url(../img/cursors/paint-bucket.png) 14 14, pointer; } .tool-vertical-mirror-pen .drawing-canvas-container:hover { @@ -39,25 +39,28 @@ } .tool-pen .drawing-canvas-container:hover, -.tool-lighten .drawing-canvas-container:hover, .tool-dithering .drawing-canvas-container:hover { - cursor: url(../img/cursors/pen.png) 0 15, pointer; + cursor: url(../img/cursors/pen.png) 1 14, pointer; +} + +.tool-lighten .drawing-canvas-container:hover { + cursor: url(../img/cursors/lighting.png) 1 15, pointer; } .tool-eraser .drawing-canvas-container:hover { - cursor: url(../img/cursors/eraser.png) 0 15, pointer; + cursor: url(../img/cursors/eraser.png) 3 14, pointer; } .tool-stroke .drawing-canvas-container:hover { - cursor: url(../img/cursors/pen.png) 0 15, pointer; + cursor: url(../img/cursors/pen.png) 1 14, pointer; } .tool-rectangle .drawing-canvas-container:hover { - cursor: url(../img/cursors/rectangle.png) 0 15, pointer; + cursor: url(../img/cursors/rectangle.png) 5 15, pointer; } .tool-circle .drawing-canvas-container:hover { - cursor: url(../img/cursors/circle.png) 2 15, pointer; + cursor: url(../img/cursors/circle.png) 5 15, pointer; } .tool-move .drawing-canvas-container:hover { @@ -74,7 +77,7 @@ } .tool-colorpicker .drawing-canvas-container:hover { - cursor: url(../img/cursors/dropper.png) 0 15, pointer; + cursor: url(../img/cursors/dropper.png) 2 15, pointer; } .swap-colors-button { diff --git a/src/img/cursors/lighting.png b/src/img/cursors/lighting.png new file mode 100644 index 0000000000000000000000000000000000000000..02fede803ef31b435620efe48671347b39cb9ce2 GIT binary patch literal 606 zcmV-k0-^nhP)ygrL@*680jFiiV;OfsoG@FMMQ8>mkf^5Q99;jl@vr! zoZJ<35QJc%Ewt*Ep;Qcl)_|2(#DrGO_q{alIwVB;M=c26=??dtd+xah{;||<2R}YP z=GLn5a%ENZ1dYIobe2Cvo$!dgTY~Rj5B-qF07oxoP?p8Q(}{R>xpKFyAdyITK@eoO z0w*W)NK2>!1YvM*lmWNK!m~Sp4KOq`?74177J=!R8B*yqN(50bI(iy~0@VZ~3WZQ! ze2EpZeH*|Soz*%_vo{#6TMj9VF*~00W_g`Uv}7}M$@HI_naO*)+h z*=)Jzc>ve|zV9=VOd<+qr)No}Q_zy@`#yz20cjB^5d_8j{M;{sjmAb!8LHQ7J}%r^{A1ih0A10LHyo+Zd*nR9fm3|0t|F@OS8&^dD`Pzp swk*yZ?xMfbA>12#a_;7f%lwb}34-#&=1IIcK>z>%07*qoM6N<$f^?<_O#lD@ literal 0 HcmV?d00001 From 17e6cf9b38a2218027f61d17e7e58b7bd241cf15 Mon Sep 17 00:00:00 2001 From: epicabsol Date: Fri, 5 Aug 2016 22:32:24 -0700 Subject: [PATCH 3/4] Dither & stroke cursors Added dither and stroke cursors. The line on the stroke cursor is quite hard to see, but I think that's pretty unaviodable. I would suggest moving to a larger cursor size. --- src/css/tools.css | 9 ++++++--- src/img/cursors/dither.png | Bin 0 -> 702 bytes src/img/cursors/stroke.png | Bin 450 -> 617 bytes 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 src/img/cursors/dither.png diff --git a/src/css/tools.css b/src/css/tools.css index c79d2677..33d02051 100644 --- a/src/css/tools.css +++ b/src/css/tools.css @@ -38,11 +38,14 @@ cursor: url(../img/cursors/vertical-mirror-pen.png) 5 15, pointer; } -.tool-pen .drawing-canvas-container:hover, -.tool-dithering .drawing-canvas-container:hover { +.tool-pen .drawing-canvas-container:hover { cursor: url(../img/cursors/pen.png) 1 14, pointer; } +.tool-dithering .drawing-canvas-container:hover { + cursor: url(../img/cursors/dither.png) 1 14, pointer; +} + .tool-lighten .drawing-canvas-container:hover { cursor: url(../img/cursors/lighting.png) 1 15, pointer; } @@ -52,7 +55,7 @@ } .tool-stroke .drawing-canvas-container:hover { - cursor: url(../img/cursors/pen.png) 1 14, pointer; + cursor: url(../img/cursors/stroke.png) 1 14, pointer; } .tool-rectangle .drawing-canvas-container:hover { diff --git a/src/img/cursors/dither.png b/src/img/cursors/dither.png new file mode 100644 index 0000000000000000000000000000000000000000..bbbe6e9d472136d68a86c783ad494315ceaf60c9 GIT binary patch literal 702 zcmV;v0zv(WP)tN#a-ClgdGb6so4$%A$aJJ1f4o}=-@Hvs&wcm zdFvMR2fAn=>@J}h%s7h~>?A0JVah_L?Bbh2e;rmgwW3?!%j5GNAAaBW9vsAR96OiG zNiLTY+qT8FZ83AEm`6BgHqIT#u@Aj4!2JBYoyla(NF)LXnM@WmL67Jlkj-Wg(TJSV zLDNX5)8>cb3)Q(c)}sNWQYnc>qm)WTM8LB0Xqr$c7STk*%3np$C>4qbf|buxuhn>Z zr}cFhAP55dz-L$a0QkOYtjY%jb+E6LLNxG|A_xK^vE;A@Fg-mb*^7PTEeiw+r2-m_ zCIH1k5dbT10Yb4*V)5f59m|uu;l{)OUn!J2I+-S`!$!W3h@gCh@B3W3|FRW;L?U4u zh9O?X6VLO+FbpvaLp-k{UZwJjE1q~>gA<8_-TZ}Wwb~zx$8ERlngI2B9TCBG%K+4B zbe@K#D^p}mh4^de-8ZSux$G>j zkbE%vo7`*=ME6$*MxJq6Z)NF?!@|}cMtYE)xfyoXHyL{MyXXXa`=Pt9kwSj1R|CF0=Fk*Fx-qOOAWINqw kBIup*SJy{pZ}C6!6a7#o3cllY1poj507*qoM6N<$f?LBr$p8QV literal 0 HcmV?d00001 diff --git a/src/img/cursors/stroke.png b/src/img/cursors/stroke.png index 0bfecd50ee9f5bc5828f0c0745aa3e0effcbe250..641f438b4972fb40652b77a8287fbeb23f372cdf 100644 GIT binary patch delta 592 zcmV-W0whikrk&Z{bemc7jFs=dsoccO4(~}N&gZJsTL4Jnf;v?9VEbK}a z0Kf%pGgnxxqJL4GhO?<+*(ky151{h>D~?}z%7iQY<1yq;4(fqpU{(qB+y@L?ea`;5 zg*LohfYNgYmGpbmzN{c}?N!UQW$tjK4taD$T-ZE z8ASEQuK32od@m6jCBY+tSSo%lxIh44YtHJ4SOR+#4}U%;7hzPJ=JVJ>YXTb$M+dObdWk9*`1NuEdeDo{#uALzQ_#A*VH|yiz+Pp<>k%3W zh8+i}+YY4s>j(hSOB*;fJBhG<8e0&MwFl731-y+WL6V_tH8gV#=n&i##4RHBj)>iF zWe^+gl1U2Z7>abF$ETvaf5?8LT((GvWg_;Ch|LSZQ{xv8o4bY>yO|jVFe(Jg3c*u} ec)#iPll=i7Zs^g;3_0K)Z#KM!W!(vQ-6}Tyx|}!`#}xw_C3!B z-yaPC&0j)XcpuX@rNfq|q}N(wJOjA&>u+z?dfJEuLePrqzy!)73pvLjxk4d6XNZt? zhm_iYES{i}J5y3l?}PPNYDBR7oPc~6L^d)Bi4Q2L3pnp!nFxN9c2E+=@XAl&+;2m6 za~kZj1r3Mz34hKwAYJvM`m%_8)DB_Egoaxng})UXdb)_=FM_>=P89P8#IP#xjp}rD zSmd_Bgq*~%D)746Q4|?eA1<&vYeZtzfXuNAJl&7ec_V&3<+`Bqab1P*2p)ZA#GP7% z9j%DYbc5&@Y*aH+v>hdW9R)swBX=JWtO|zAEf}V>pdrUQ6fovCZT Date: Sat, 6 Aug 2016 09:23:05 -0700 Subject: [PATCH 4/4] Renamed lighten cursor lighting.png -> lighten.png --- src/css/tools.css | 2 +- src/img/cursors/{lighting.png => lighten.png} | Bin 2 files changed, 1 insertion(+), 1 deletion(-) rename src/img/cursors/{lighting.png => lighten.png} (100%) diff --git a/src/css/tools.css b/src/css/tools.css index 33d02051..dca84a08 100644 --- a/src/css/tools.css +++ b/src/css/tools.css @@ -47,7 +47,7 @@ } .tool-lighten .drawing-canvas-container:hover { - cursor: url(../img/cursors/lighting.png) 1 15, pointer; + cursor: url(../img/cursors/lighten.png) 1 15, pointer; } .tool-eraser .drawing-canvas-container:hover { diff --git a/src/img/cursors/lighting.png b/src/img/cursors/lighten.png similarity index 100% rename from src/img/cursors/lighting.png rename to src/img/cursors/lighten.png