From 9625fba3cc740b330056e010e7c063105b65ebb2 Mon Sep 17 00:00:00 2001
From: Dane Johnson <daneallenjohnson@protonmail.com>
Date: Wed, 11 May 2022 16:42:40 -0500
Subject: [PATCH] Can delete nodes from edit menu

---
 board-builder-impl-egui/src/main.rs |  14 +++++---------
 board.zip                           | Bin 512748 -> 512748 bytes
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/board-builder-impl-egui/src/main.rs b/board-builder-impl-egui/src/main.rs
index 0c7724b..ebcb11c 100644
--- a/board-builder-impl-egui/src/main.rs
+++ b/board-builder-impl-egui/src/main.rs
@@ -216,14 +216,6 @@ impl BoardBuilderApp {
             }
         }
     }
-
-    fn delete_node(&mut self, x: f32, y: f32) {
-        let mut board = self.board.borrow_mut();
-        if let Some(nearest_id) = board.nearest_node(x, y) {
-            board.remove_node(nearest_id);
-        }
-    }
-
 }
 
 #[derive(Clone, Copy)]
@@ -281,8 +273,12 @@ impl EditNodeDialog {
                     board.nodes.insert(self.id, self.node.clone());
                     self.open = false;
                 }
+                if ui.button("Delete").clicked() {
+                    board.remove_node(self.id);
+                    self.open = false;
+                }
                 if ui.button("Cancel").clicked() {
-                    self.open = false
+                    self.open = false;
                 }
             });
     }
diff --git a/board.zip b/board.zip
index ccb078e2bcc403e2b5977934b1a6f0fd6d9496b0..b657d40f010e2e2ac0b5bd2067fa043fa5b1d4d0 100644
GIT binary patch
delta 1279
zcmV<b1OWT&r6262AAe9w0|XQR000O8P_3&}aX2mVe*^#k7Y+ab3IG5AXL4b1XfA4V
zZ*F~8ZExE~4E`&IJ`2N<yf@`rS`<Y$v>TRn!%+0YHNHAR966BXwrP?7UP`f!C!f>U
z2y7#GLh^Yb{iE83PjS1iE`C&h$4$HIs*4ZRt3$uLk5ye=9)I>jAGU26Uw`h~>*>XQ
zdjD?M4>zmJyLkNgYIn%qe|)T~ZnusTGMMrAx9URurW^7`8LF#?@hv!S`RVzO!(FT{
zs;leJt=leqnf^yyZ$^X<U_aJU=_6y4PLQ6^T73kxPFqhl;k}DrSFaCk7jrl=H5G`^
zNRglksj){)?SD)&)}28Ai~Aw=-73v#21ZrmDXs>o)M(}B*2$9QL70U4d$<o>26hUB
zN(%JUka2U<8V!Nf0yS}Qw!#8bsxv_3ZF9slwy~&CFkfvR?uWeB8u`f$7n4L1%&|l5
z=1Dqojngh+zKq?duT|1k0xvLK!nDNgDwxOUy;V*KzkmF^xd~mn9~QGDsIjTh7v#uH
zozY~JJHnzh#_}f#_f3C$81}cn7^Ub3y;BNNuo^o`NJbf+^z$-wVV$?_YEu_Al9d`8
zV4joM{lpLzy3B3+T(u<SI%^yzwF4n&C&m6BP8(+@XmyI`6C5EDu(W49u)gsiLVDfD
z*lpS7i+{$UU>rq7x?zFqxkAed7zeSK=NS!|8mUHIT9SMg9#%nO9VUHdar8&HyS@p-
zZH}vpQb8Ef&O7!|GCBKnw5sIMn3`vu39Qdzsv!DAF3h6$vz0vC%A@GM->{iDIe)=9
zNZ(qK1)WAp0Mww)ISRw-Mc)pg?G`~?gDGGWDt}n#P}7_tV5c9q?EWjOboEc{8GP42
z<RU15CFIetN=YRNcyEl!a{jN_AM!fONxCfFJx8yaIl{?AAXUD(jwkX2&uyP^rbyIj
z-MA)&r_q`exsyPiWV&D2l8UBLNU~lz!~{A<yvfSsMY({&no4PA<T%}EHKS>Ro)nf*
zoPQSjjB9FriYls94QR~vImafau?XpM8}<wLaCksnt_(>dM&SIMWq#ajLiBqsGKW)V
znzorBH473_67vATVP4*+*bj?SqwJPkwj{`UnDf^m7`AOj$gYbg{MwodK**xaf<ka6
ztqSkPr?h+9vjZ1524|%mw^?aK6u%fGjejl$n>WBAe4@uQkx2!l%+m1TrtFN!G>=!2
zjPh-}UT@=S%;Fr8>3%vB3Zd(arKiUnM$EY)ZHvA3zH5iLUR@1gVDRU2PWa*_%nD5l
z6D{$0Ap!r{4WVy$OR<;gB+<L&{lJI8Ecfa7Fd~7gmi4q00Mxt<I1<a1DJtO01Am$n
z?Uwbx2ZLV5X317T7D1Lr#`4XY%>H!EiQ8|Mn_?`nT$8fWl`)OgGxwIa`}j<7FZ%Gk
z&27mRITOJG$V<W^YLkvluf38(=HJ-G@A0q=OGv7r@H(07ytdA&bQ~eC$c*dx=sI^C
zmEQ(TR_gSaOXa@D2r&ijbK)%Ak353Sw};bd5&7|}OMY{{<?C=0_Sd1$9aZKNJwrP^
z9ZH!;cim>UY+bAR^q_fs{0UG?0|XQR000O8P_2Wr1c$Q(0f(~$0*A8%1BbH&1c$Q(
p1&6Z)2Dh^W2f)n@P_3&}aX2mVe*^#k7ngw22P*<lt(UFR2S0pAb7}wp

delta 1279
zcmV<b1OWT&r6262AAe9w0|XQR000O8ldP*$xn%+Re*^#k6b=9Y3IG5AXL4b1XfA4V
zZ*F~8ZExE)5dJHMJ`)4)cznw@w<wBjXg93uhN0*OHf9|mt{lkny0plD-_fy1T1*oQ
zK@>!fj`zIW<$JdapW^P&U48HVh}(WYbXOm`^`Q@)=-%y*(|^rs{Uwh5b-I7MA206L
zpXVQrhiMGE(?hS0<NhvoA0I?F>^Jd*3@Uy9ue*{zAt{4MT6Fj6RvSl7D*oH>C3aWc
zUvY@v;&GRd;%1v3|DXhr0Qe|Mtq+Wjm_appt$@rK)EI>xz+}`{;V`XowKFaX)B;JM
zYM_0FHd>>z?thGo{2D{LAiw8h*QH9KnnIP!Xigak(w@;kS#Qa>jP`5za(xq~+qz0>
z@Cuwl<YUXZnS5mD9q5erdW><{g<(_SS<x0)=&^h_^6Ctz9vev+@XdbM?jL#1^-0l|
zSOAsO+8dgWY`EHVWyBX__}14gOkB$)9?4RnCZ%%=k$?Fy{F{vT^LTrl4!0FxgO#Dc
zJbvcWGPzPwA@}cinBq9B-Vgm0H>-D3m>BWL$e=Sc_t0sn=SG5chOff(yK82pAHu&E
zy#&)hLaEl0C+W|K#IjTpGvLcOBnwvVoI$mq2Gx{8t+Sw1W?cDn6$za@pPF#?b!8tZ
zz&FT+D1T&W8+5aEtRrh&DR@0@xnyp^GY!>MY@9x`(pf?pEb0q~KSx#Df?{z3QmFha
z1G3sD`WhKL)d6gjUut&RSR?5S>ySI(psBdd&Kx6+4zMt$Sy<A{24E|sax07Wo6Rn+
z5`3*J4m&5%3T(UuB~M5y1C(=A0Vt1D$4Qu0FMq~<3jI)nYtbqfO9mt(Xl8#_!YTG_
zE8Qlb8|y;VT#~NJDN66ikiUexFgznH1wTkUzVQZYU)@|vl%1kl(hEB_4IVO?^#rC>
zqot=<Z#r0t)ND~_d>)#o8Y}g0@9(CCFpXf!n@Y>f<P-&;-D$wGTB}?>&-x`L&8Sqi
zN`Gc$9Ly)T2>gPQ%fn_r#KS`7LN&(3lFu3yq0L$EH1K#Ux;d{WjcVE&ODGwi_|5~<
zIg|WTAp1`opBFWP;0dR^Pz|i91_@at$U})v=~SAz-ZAWSF*VyMTqV7+{Ir_s26Otd
zm)v}1C9VF9BfD`w-q!=ZIX+fmCvSb$k$)yqQY|_fPs`GRsRk4a@4O^vC1LjBsi$R#
zu0L;Y!q6Y43qzt$dDQMoP}oOp4ddpe&N;1FVHx=MI3DW|YJ;s>5DiFViRZ1s*>sgP
z?snuzi<brRV!+9U&C$!rk=5xTn;nf}*b?!-4O1BVeT8bo6Vte;Q#!{p!erh7w12IZ
z<Ml2aE_Oo@$~DB40mQqeB{@f%<4sf5tJ0gW3EObE4r6`p){tdB7$+@amQPxRwXH3_
zv`!n9SWZhWZ5np&9-Wu#g&Ln4ybaT~8s?5?K|VB|;uoqSuj67N1}7X7-MEITtsPA!
z*`$rVlHuF<b@lql;#nqJgIG2W{ydLDN)}JnjW=nEH@m^hFfd0It`k<Yl@?%jjK#dk
zfI=W!VE+lr-I%u=TKMMS;eSv|0|XQR000O8ldOZY1c$Q(0f(~$0*A8%1BbH&1c$Q(
p1&6Z)2Dh^W2f)n@ldP*$xn%+Re*^#k6qkU~2P*=Tte36Q2R{M|V&4D&