From ae7c5411a6b4c4360c229e44c9b1e88e5d9cacbe Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sat, 15 May 2021 18:22:17 +0200 Subject: [PATCH] PixelPaint+Base: Tool icon refresh :^) Redraw and shrink all tool icons to 16x16 instead of the off-beat size (26x26) they had previously. --- Base/res/icons/pixelpaint/brush.png | Bin 980 -> 149 bytes Base/res/icons/pixelpaint/bucket.png | Bin 334 -> 259 bytes Base/res/icons/pixelpaint/circle.png | Bin 1005 -> 108 bytes Base/res/icons/pixelpaint/eraser.png | Bin 280 -> 208 bytes Base/res/icons/pixelpaint/line.png | Bin 171 -> 80 bytes Base/res/icons/pixelpaint/move.png | Bin 711 -> 163 bytes Base/res/icons/pixelpaint/pen.png | Bin 333 -> 194 bytes Base/res/icons/pixelpaint/picker.png | Bin 254 -> 179 bytes Base/res/icons/pixelpaint/rectangle.png | Bin 859 -> 97 bytes Base/res/icons/pixelpaint/spray.png | Bin 231 -> 204 bytes Base/res/icons/pixelpaint/zoom.png | Bin 913 -> 232 bytes .../Applications/PixelPaint/ToolboxWidget.cpp | 13 ++++++------- 12 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Base/res/icons/pixelpaint/brush.png b/Base/res/icons/pixelpaint/brush.png index 5b09f4eff8f1e914e06e6590c486aa40101c44e1..cf1207417babc74ba2e4f35bcf17c732161eb384 100644 GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7Vmw_OLo7}wrzr6Mu|II& zz=ruuXaB#Jl=x@t@L|QXgR6i3@BeSm`y_MS`W5Q_pZ`5`n3R*|botDI0|yQSJjr#~ z((ChrX}13zb^Y4+`FwxkpX53e9WYD^JafXqpMjyo!7KiURZcAf0|SGntDnm{r-UW| DIafVb literal 980 zcmeAS@N?(olHy`uVBq!ia0y~yV2}b~4mJh`hLv7E=NK3mTQZ%U13aCb6$*;-(=u~X z85lGs)=sqbIP4&EG(LD~losDwg+~(>T15(o7GBX3S?IJvG^*5K=NIl-CMueGeNEX1 z5B48j)!e;#9pAbpg&&NMp1fG{LP_i!JVAH)D&Si$mHpLv>Hj5}Ek#A3lE7JGR+s{_o;1D=oVj?Iu=ClU(Mz$I)hQ zru3Zeoyu!8Rv&qOBv~zX!jFlsyN>72;nw4}F-}?*{P~Dr(#8wNyrefTS}Eu+=pO33 zyhicy##5Euo5R*^dS?5R+u5=?f6_K63SrYShKG--Kh9Cqson=8Vtd8@zt1OLvt z&KRzpUI|Yk99X4NuJiw6-@kk7r^&)`K^lA|`z_8L=McETDrI{7r(M~cW1J7_+17oT zwm*nH&CYZE)-5jtFYM=yiP>(F%D>|dBinqQn^R&>`UjtQ-uT`4*D@V}eXLE{artL! z=h!i1zS62>mXTpv%z7&B{fBq+zTNw0d-=_KcK-UJ`g;4gy$lQtY)RhkE(~Ds(|LD2 z0|NtRfk$L90|U1(2s1Lwnj^u$z`$PO>Fdh=gi};lQDT+rvJwUc2FViFh!W@g+}zZ> z5(ej@)Wnk16ovB4k_-iRPv3y>Mm}){2F5j>E{-7{$KOt~_h1T?Ile!=yktR#(hNl> z7n2U>78X|CJY6S22|d3@0x_<^9wu8@1ziQ!wOvqh^iXZt5~a(_7q%c^!uo?b8xHBj zIamC6{--?7>4NyZg8T~ky8GXM*WPFRKS}eM__-xP&sR@rd&0uFGeN*|`DUh7K^wSc z39}r?V?UJ0aA4ugZf-nVM)V&TURL;j!K@GVH3 z`M>AGZ>|?tUsSd;W&gf=*9%+evt_>yUE0{}(8VjMbH>;r?lar;uOc>afjefheR`!7 z|3Jgj$c=-Pq#!;g0 f_~w)SG5M?Jo5RlP-e};S1xgK`u6{1-oD!M?4YYKYvOJ&TBId8Kl*hPr!COh?y0$R!?DI PU|{fc^>bP0l+XkKK6Gmx literal 334 zcmeAS@N?(olHy`uVBq!ia0y~yV2}b~4mJh`hLv7E=NK3mMLk^{Lp+W@y=s_s*g&M= zVf>;AS0$|^sv7jnEF1L`mOtUz>2*AAQ8>rJT@C&MPqbOAM7pl~yn57f)sV2xv23}Rc7Zkfks&SHwW7v%HX z<@Ij$TACvK-tgERS?Sw6ufo>scl%`})$sKGEZ;rl z+Y=O7wU4dY+MH3-uaKX^Gf`&M<{KhRABx`nk-Jx8z&;`M=F)TLz8bfdu-)QiIPmVd p^UpX*U4zaud{uExUCVR+yLe2_z7n2rjDdlH!PC{xWt~$(69C_ukbeLG diff --git a/Base/res/icons/pixelpaint/circle.png b/Base/res/icons/pixelpaint/circle.png index aa56e05083d038a693812aba8d15801ccd3d2cd6..9680bb8fff660c932cdbf49e998c4682a60e0187 100644 GIT binary patch literal 108 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7j6Gc(Lo7}wCrEs15N!WZ zFLZTr#vlK6f9i!|{>>LUt5G#WgZD_Ic|%sCN0~{Gts<`@1A~PT|8L&dW&ao$7#KWV L{an^LB{Ts5KP@3V literal 1005 zcmeAS@N?(olHy`uVBq!ia0y~yV2}b~4mJh`hLv7E=NK56ZdZjwlmsP~D-;yvr)B1( zDwI?fq$;FVWTr7NRNQ(yJ#f=)EuOafk*?DlR9cP{8O)fuyLtDYe+jSVJegCr>}~B1 zena7&)E}(BSUeB?d~dH@bJ*22$s=o?_c_6Et(66?haZ>5mUm@dz3zPX{fnD&@5Ff~ zKhV3LZ1=uVbLegj=e@gCov~|f>z!Z7 zVfdc!r>fg+zh6nyZ}Zv*S69?kB^K@eA+peZUcL6&b^|3;k3TKKpz;FQ#~ zKpuJ5+hLj-eX3>xuNPD<*y7MCaZzT($UBZ{>fY)Z%L)pax1ue zSUZD-e%7*-Z7H#p#?!rb@yORu5ZYJKhaG#Oong_Djp zut{@l2nu@Auj>jUS$k{1*Ct^a7a=X%VaHf!6RHI>?H%idku__z9< z*skxFUVEwsz4Tc=@8_1w=Zmg2#z-4ox-hYwS3dR1>|4uz`Siw}_&ZA~H*0c4)ZaIb zylI=|g-rT|=bmxs5pLY!%jA(U@64iLFPoFTX&Vj9T8&mr^s|_&W+>pJzL9U&P1_TH zCq-ZQ5`E`K`jbO0-{U863*S}yKJ&Ktm8#hL8k-o-##$sxr9Mb-ZojNuJ@>w6eGPxT z_6M;l?!B$|obnfLzYzW6zp}}P$Bgx+hszhlPORIlox6&Gf#IyDi(`n#@uyP_`3@`a zxXSZ95t(V>YR-2_I!)8L|6uB>b4$2AI0Bh?Q#)0~4C*B8%wjIeHL!ovKg>RVRcG_p zy`KXXnRl0$WpUqO}J8TWxX5C5NRmI?O{hp@Y3Py#g%}>@?g)yyVezZ<^ z!EJ^B(_`^Z=WcJ-lrM|ooD~(qsaoeX`$VF%)cq}CdeUaMm=n%K6lnftcv+TZ(rs?w R$iTqB;OXk;vd$@?2>=(F%=Q2P diff --git a/Base/res/icons/pixelpaint/eraser.png b/Base/res/icons/pixelpaint/eraser.png index 5c8c53bdb09f5ad577a5cd6202e4565338d5ba34..70dc5f070cd58b7160e173e1741e497c3e3f7c2d 100644 GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7rhB?LhFF|VPLTN2FtOoJ zz0BUS1_d^g@J*A!PC{x JWt~$(699xfReb;e literal 280 zcmeAS@N?(olHy`uVBq!ia0y~yV2}b~4mJh`hLv7E=NK3m?t8j8hIkx*du1ahlc5OP z1AEDXf_WT*Yw{SDTe!@5(6xH5eXOahJbCopKP}Be?)R!W z4OES@&OChkGV^ZL{&}nSJJ=~54AE3+TRDlNedQ$&4q@l(%Qi9;MCMFreksDj5Z1q# zqjLY5>v78!f^s@syxkS+Rv1}5Da%N;?NSsGb84C(^3jk_v3g1u!+|$lm)Y^hVL4k+) z!nObZpI3ccRA`m(`rwV0$G@C77$5lCS&17~XHhf`%2 z8`n5UyF>a2=*KvK}39^n^HJi9io zR9meQFe_HqKS2G4X*jFdh=m|0##MdDRy&qzZb`)sc|IXrulHm-U00H~kZ}xI1 z?Q|4-bEB~PiQR?=GLcHDhXoxbNEE1u{AX27Gn(8QzqqI}ZG*Gt+L`NCt_zR-x~iJ# zwD*OMSP*eELHj)(*{PHuMB)IrskNfYH;$M_+InSzccZ!CW;It zjdBKz%MSFax-4c|u=0eQq`R?}=+Qedml*3_{}tM?&7qe|%$DWc5_^NA{}bNuH`*Dn z^(}qP^gJnn>D1zzjv@RxjOl8wuMe<(xa<1gdsp`s=LeHJHmJr6a$H=xg1M&DG$Z@? zMwP7>)0|)1F`bW*|9kgf8LRJex4HM$-ky3sY|*RQgoxvdrq0fB>yv%3-1lH#x-Um! z;+2=O2eQ2%#@vx()OY4k&vS3rDq^@N`FG+M)(`g>_lSOWJ7983Ls+z);kVuKX$W6tDBd?UVp7wTU7cd3-b%-pW+>e5WM8pMQusnh z;N0C(Kb5|x6i1dZU60*g=I(5HYkO@{#Fb)GjcGgmPwB0n=JA2WB5?6n*UODrlS2Q7 z=oH7g^)BN(&3>uh<$d-`Ki;O^-g5Z=fq&cMKs;_2cTqH+H1rH#A|1_CSxT^A`v6>?wT=iL*n zSo&;&){8_=1;xYXCRn^Yywh7wD%oq+q%Q}O?~1Gue$Snyupr^icd4w5y<9IE4gY^w yZIBd}+kSu}z$@|mh7^XjW%c>7H3?S5O#M02nO8C@q%trtFnGH9xvXlrd+O>vkWtpC|D!R#+*;mK$x{I;5goK1dM8dS1JvP0Kou=InUn;+fZVEd5@Au!S z4{u#lV#~CA72Om#b$=cE#xrM|cTF<@0q2)(?D8!VK36Ry_SODB`{4PKqYs2@J6H9J k&v5*&sZ+qt&%n_9^`_Hmz4`AL7#J8lUHx3vIVCg!02!Z#ZvX%Q diff --git a/Base/res/icons/pixelpaint/picker.png b/Base/res/icons/pixelpaint/picker.png index a88f39fcd2622ed2032bdf3be2ff2003af0a2216..34f987766ea2aa868d293f5caafb35327e8392df 100644 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7sytmBLo7~jy|9tDK|zG& z!tWhT$~P<*b9VA>J|V=Dl%9QPeOV?6hQdh`7zu iwJu%yD?X_2WY9Yl`9piH{viei1_n=8KbLh*2~7a$1x6$Q literal 254 zcmeAS@N?(olHy`uVBq!ia0y~yV2}b~4mJh`hLv7E=NK3mj(WN{hIkxLPFNtEu%vP3 z|BW-xdpLUsyh&KHQMKUoj28)<%ph<%z>DYq|Nre39TO)`Yz!-8*?fd8PfPi+V2)hk zqGhVP%ib=ky7rTw^_sz+;^%(ZNkT_gs4kw?6J<0-Co`<_^Zv-EXY1M6+WxP$w)?ky zo2rh1_XX8!C3RLs?{0CneRF-sbCJhda+=YO;5c7}=#Xl67FS1;!+sXkn$6bAu69n` zPCTyW@8&FxJKC=MV}kC&BjysNZYGEQcus3}~B1 zena7&)Q{X>7(EaDd~dH@bJ*22$s=o?_c_6Et(66?haZ>5mUm@dz3zPX{fnD&@5Ff~ zKhV3LZ1=uTsR+UBHBwY=dG=l<-v!>(6rlrAZGA|4ld%6Ro}Rqfthd*~>8C&UtWuliqdR+M^u||@PF~$Sd$;)d z*6s%!mnU_%K3X~@N^pzQu0`do?rYiQioF;Ll6cr%^6Ro~EA4_8ix=%*<~IA5%Cu?o zZC4!3`R3g8tZ>m}$&NxLf$g3Q+_Tg-znCKAUo<&Vr^k08Pu3D)zvZ4hESEjkH0PD^ z7wvx{X7X3e{Ga4bgNuK~pB!@8ezNx2H`c9j*Uh_h9E!!y&2f{oxbdK%Ds}y5>zDoS zALg^(bIM=1{X+B$-7jKQ+<)s^*y?N^tWW#F$K*J%^@rBUb_NCpD^C~45Rc=@2@-h? zf}MZoPb)LHc-mcurN)!ffm3nU&x|XJ0=wOGrM7|@Y|XAZEm_ADpD%vM&cL6{tY0Ku SF`a>dfx*+&&t;ucLK6TyHj*a* diff --git a/Base/res/icons/pixelpaint/spray.png b/Base/res/icons/pixelpaint/spray.png index 44317c103a49ba3b29a79e9f662f1b41e3ffbd44..3d42b0d7cd5e2df57da3b82e2adf4e3b1dc6e19a 100644 GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7CVRR#hFF}wJLw?jVFMo5 z`A+N~RN`DNKS{A^@|%0CyJAw#f_XVE9-iI$OXYheT>L$$_d)%Z$8w9-9}0i2EzBUl z%hd94@+6Mcua=%$Ro~H}eu0G?z{Yii#68-@JYP&y6R!{w%IyoO(L(S@1sF1q=)f44$rj JF6*2UngCp;Q|tf$ literal 231 zcmeAS@N?(olHy`uVBq!ia0y~yV2}b~4mJh`hLv7E=NK3m)_J-(hIkx*dvz}_vmy`c zgX5ZuQ=~ULE<3@q(q=;UmYxGLnl}z)7G2V0KeBIrhz+Nr;sFfQwq=F6>T#zopr07I-<{{R30 diff --git a/Base/res/icons/pixelpaint/zoom.png b/Base/res/icons/pixelpaint/zoom.png index 5ecb307700e790e01f3213c4fc34c4f786fd7c08..cbdaa117d9dae4d4df6d55a49524dc90bce418a3 100644 GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7)_b}*hFF|lJIRobNm0Nx z{lt}fhc8tKR{@YLY m3(cC^!BIDBcZbLa_TZ`lk*7*O-Z3yRFnGH9xvXn9TYK_>qDhmT+Nj&0s^{;%b)DSJ*b%y+OkU2<6Ip2EC) zTT0ITK9U$VN#s%SqZN+gDs@kGz4;{le9_^$d6H&EFDoAzYz%mlu(LVxWI*Tg4&|;@ zf&1)VZ#q=jy*X;-#%s1ext%L>Q)j+5ai4fZX_|slLyy#{6$hMp!g@u7GjI7<{BW1q z@1Zv{Ce@%wX91V!q{r<4oA2M9)p~NrY!NSpyZYPy8nUsJH>Ta)w!c4jcO?_cyhiP{ zZ`YeO%=EwXI#;)dSG252F?PH$YKTtJ!KGP ztXOJa#=yY9UgGKN%KnsDOpw>Y;&|*d1_lPn64!_l=ltB<)VvY~=c3falGGH1^30M9 z1$R&1fbd2>aRvs)YEKu(5Rc<~rx|)2b`WX%FK*SvrPSodrN<~(xO=v&>?;+G8&@M^ zWMhur3_aKsY;9q6KUYbqMDW!T1*MR}dOpSDPhY8)XMSjR_&jM(|M!2#cMBOGR#!6O zpE=W@F)HV?g{PxMKrP|$ss{V(b04fU*7oo^8I{d& z;LAx~hJ@T?VTOV&cJ^T>Z(ft($ZFyWb-z9I|rgS=Tq-_kX^&G|MZmc0?Lb?Ige U3UXY}z`(%Z>FVdQ&MBb@05NuzlmGw# diff --git a/Userland/Applications/PixelPaint/ToolboxWidget.cpp b/Userland/Applications/PixelPaint/ToolboxWidget.cpp index b20301030a..b45280308b 100644 --- a/Userland/Applications/PixelPaint/ToolboxWidget.cpp +++ b/Userland/Applications/PixelPaint/ToolboxWidget.cpp @@ -73,14 +73,12 @@ ToolboxWidget::ToolboxWidget() { set_fill_with_background_color(true); - set_frame_thickness(1); - set_frame_shape(Gfx::FrameShape::Panel); - set_frame_shadow(Gfx::FrameShadow::Raised); - - set_fixed_width(48); + set_frame_thickness(0); + set_fixed_width(28); set_layout(); - layout()->set_margins({ 4, 4, 4, 4 }); + layout()->set_spacing(0); + layout()->set_margins({ 2, 2, 2, 2 }); m_action_group.set_exclusive(true); m_action_group.set_unchecking_allowed(false); @@ -98,8 +96,9 @@ void ToolboxWidget::setup_tools() m_tools.append(tool.ptr()); auto& button = add(*this, name, shortcut, move(tool)); button.set_focus_policy(GUI::FocusPolicy::TabFocus); - button.set_fixed_height(32); + button.set_fixed_size(24, 24); button.set_checkable(true); + button.set_button_style(Gfx::ButtonStyle::Coolbar); button.set_icon(Gfx::Bitmap::load_from_file(String::formatted("/res/icons/pixelpaint/{}.png", icon_name))); return button; };