From 42f3271f54c0eac3a972449ddc3d6d28934912f4 Mon Sep 17 00:00:00 2001
From: A-lex-Ra <rastorguev2047@gmail.com>
Date: Fri, 19 Jan 2024 20:33:35 +0600
Subject: [PATCH 1/2] upd delete_icon.png

---
 res/textures/gui/delete_icon.png | Bin 1140 -> 237 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/res/textures/gui/delete_icon.png b/res/textures/gui/delete_icon.png
index d0584f0daeecc418efe69c61822911bd1842dc3b..f388f8d8bd61c6ff9444060fdfe4ae74a2870150 100644
GIT binary patch
delta 209
zcmeyu@s@FdN<Cw7kh>GZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao>Fr%o3
zR|8P6$<xI#B*Ojew2NE^6gXV7<zKu1+#KE3YkMYYO<-TOg30`K=8DNLQv5TjynQl$
zb@(opKf>s^UOj5vuFWdXs(arZo5fpi{K49Q*_ZK**PQ+mg^ZoM^EU2dj%Q{RU;rb7
zSchWeN&EkD2|m3My}hjYtE@z;Jv&$a+znRxK4l6m%q@Rx`0r&LQ~^4N!PC{xWt~$(
F696b9OUnQN

delta 1119
zcmaFM_=RJFN<C+RM`SSr1Gg{;GcwGYBf-GHz+d7TQR0@FlgeOInpcupl9QTZH+A#%
zX+S9nkd#YeNh*Vpfsu*6fuX*kg@S>Rm5G6sp=F5mBsHKK0g#%I%-mE40|P54GJJDb
z?GR9o6Kr%*B3RP!V11yd5>S*EB<c(lEJ|d6P#OQ<zXVEfgCv5JQ}a?8z~ocKSdc4(
zLBc_)c`2zy2z&Gl3>KKjIWjOXr+d0MhD2~~o#vZ=Hc;T$-LSn|;vU&{u?Pw&U35vx
zPE}VdGqY=2x*;L6zL!5CF*)-ob42Id)@dHQ99LfR-g56&k?sEK=b7jK?w?cb?Q8UZ
zrt$Nc#m~;nH2!WDraO7o*=Kn>V+7X=esBM+@A;!_@x=<sZS#)2ninv4fw5Gam_2`<
zS6|2X?)hEQMH@bxR!)7eO2R7N|D|};w6xFDa{v2gEl&LCSs1^o^O$n|qvn-s#rIBR
z&OGQmYro#TIS)K6L%yutl)QW4t_NAu+;9Eq_|f?z{$-=sjj-+2>p0Gz?EHDW^qlRj
z@0{hHj&}mpo>hN|jGSTie#P{Xua9iEJ$tgj^OWhw0Iq-Db8YW+=4&y3>3X+>f$hlo
zBigQyqgH$}C^dChve|Qm{L<#9e3zT*e~C!MbzbI~#<x?!?Auzu|DlhCZmvvrdT`&U
zr|o02%H8)XeysV?Em5Umr)Q_OPrvQi5%Hr5nn}s`z1J_<#lui`Bznnr%@yWekF8!Z
z`*fvkSa{-}q~<S0xv8~I+n6t{RLxkWd+Pov9+n&(l^Jsv)=&N;SEY5QWrCi`ri|)b
z<x};n6WsRNmMJs%MJ|y|T=3}crZUy4U19C{dJOaWGMlGLS&EdcJ1belXylq07Np1U
zZo05@_3fmOC5AejX60=)xgw9cg^YN1GF&<u<7513_PS`FvU&5~*IE>$9A%YVraF;3
zA!x&O#!_B`B|8-6Z?Mg(U;c%uhIO8L#_gaS@AItn2R!HaiA&D@-xGSR&Bt~Ay!qV)
z**-q%j!SP$i<54cb1BVaMQiv;w}8;_2MKBiJ6^P$yH$~S{YZecLqbitj+w-^K87ul
zXU|9$l~st=v93R~KB$B{L1)j6IeHwHE55CWEz#Q(DXqHqn@f`RO17zLhaRwPic4mH
zaCTMA99g3V{`!#L)(29yGu-Jh<9coV_4I-L9(;Uzm{;UFS(I}hILk3d{EP9M<p$hO
z9&m`&Y~y@*TbIFHdEPYR2i40y+-ZvBE^>Ltc*T2TT9iZmE>;801^!RVdwG?FKUbCg
z`DLj+?N5vIO*NJV^(o4JPtr;vH0>9D^sx9~<ahd*;+?YZEYCtB5;pm27*sA~ec!c^
z^<#~9^e=;X(Nfb4zJFR>exBjqpR-Lb@?5pjHgtT{*7~K}*Uhctr^2;dLiG21KclIk
gk-r1Q7M`>}(|5{!`KkB8z>LY@>FVdQ&MBb@07y;is{jB1


From 8386611f408f1283f80877d851fccc3a7c9609f2 Mon Sep 17 00:00:00 2001
From: A-lex-Ra <rastorguev2047@gmail.com>
Date: Fri, 19 Jan 2024 20:46:36 +0600
Subject: [PATCH 2/2] quickfix icon display

---
 src/frontend/gui/controls.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/frontend/gui/controls.cpp b/src/frontend/gui/controls.cpp
index 65ce5246..626c47de 100644
--- a/src/frontend/gui/controls.cpp
+++ b/src/frontend/gui/controls.cpp
@@ -74,7 +74,9 @@ void Image::draw(Batch2D* batch, Assets* assets) {
 }
 
 // ================================= Button ===================================
-Button::Button(shared_ptr<UINode> content, glm::vec4 padding) : Panel(vec2(34,32), padding, 0) {
+Button::Button(shared_ptr<UINode> content, glm::vec4 padding)
+    : Panel(content->size()+vec2(padding[0]+padding[2]+content->margin()[0]+content->margin()[2],
+                                 padding[1]+padding[3]+content->margin()[1]+content->margin()[3]), padding, 0) {
     add(content);
     scrollable(false);
 }