From 190dc195391306e101c61e556b091adfdb64e16c Mon Sep 17 00:00:00 2001 From: Tanasart Date: Fri, 17 Jan 2025 11:13:11 +0700 Subject: [PATCH] [Graph] Fix copying node inside inline group not reconnect to the group. --- datafiles/data/Nodes/Internal.zip | Bin 9092560 -> 9092560 bytes scripts/append_function/append_function.gml | 22 +-- scripts/globals/globals.gml | 2 +- .../node_collection_inline.gml | 4 + scripts/node_data/node_data.gml | 56 +++--- scripts/node_functions/node_functions.gml | 13 +- .../node_iterate_each_inline.gml | 4 +- .../node_iterate_filter_inline.gml | 4 +- .../node_iterate_sort_inline.gml | 4 +- scripts/node_midi_in/node_midi_in.gml | 1 + scripts/panel_graph/panel_graph.gml | 166 ++++++++++-------- scripts/scrollBox/scrollBox.gml | 11 ++ 12 files changed, 156 insertions(+), 131 deletions(-) diff --git a/datafiles/data/Nodes/Internal.zip b/datafiles/data/Nodes/Internal.zip index c4527b1b425b1c7bc6c76e5360e6e5e51d7821cc..64b50ae3b236ecc0072ee46fdb36264c05214c19 100644 GIT binary patch delta 1357 zcmZA0TTD}T90%~t!iqTXhSPBrD2RYu1n+=V(PL?gIB^bzg7fa?ZqD1>rY+mPJN19! z`#&)nHBv4{U(}>d-$b)ur{Tc|vprypF~-D)E%Cv)2fzJ!jvAYMlJD>Lzn;@})8{_aHa*&Jhn1G3xgvrRm6nuoKn1+v$4+GON0|h8V5qu~{ z31*@cvrvX|RA4qLQH5&MU=C_ghq;)C`B;F3ScJu>M*|wM1b!^VGAu_ER$%32GZOG@ z=%~}RK{H<;3Ya-k9SxW@68;F7vn4zVm{k&{G@F$Ys>58--E2;lYMa z_XM4dcu<*)cLvQ0H{|QnL36xR7lUTG1YgR^*SCj|o3pmXlacpc`jft?oLd!g&Xuam zt@ehTd!Kc~-H>zLG2vJH#<_x4QGl8$NFfSS3$3PBT0@`ET56+p^eL^U�X?&_?Q@ zPKr<$b<-yLoHo-I+DhAKJMEyIw2Qu=FKIV@MPJi5^eufyd+2-GOZ#X)9iW5s10A9t z=_mS`4$~2eQjB`&7y6ZcOIC+*VvnbTZ}P9JsF#p+4GYsD*>nw8ywdvrIvU+chQ4zX zd2f9U>BR?!&>#~o4Z-g&sf-ug0R5gUxMBU7DecF@R-FWXp*}tG!1BJcQ`;@8_RWOa ze=V;*f6L027RP+LXly)FkGd^xGgD7US-I|-xe|`0ci&VT&(g7!vzV=U?j)Z+RT=lj zpQJ2`C!eH_Ub!bfvqZ02Bw@5yEtOD|Pz@5g6KaWs6A9HQ;qQd=u<^fZR}Ia zBpmN^#<_=~pY^FiX;1BU&S>jb_0nN5^gzEVkZQPJEtcSq+J-J1P_OJ~_P##Y@>sXL)Ugp8REcoLsUeO`~4>EfUl?f zpZNYy2n3AlE(Tt}qyyd<#*8Z2gAYa@W(YBcga=G~F!JEHKh6v+8;8D^@*UFFV$esY?N>_XfBfQThOeRFsH+;lh6?1ivA9Bwp54R_Lm*z;^*U! z-EmLI*@y>K%Xn|dtaU@Nz7jGErMez6Yb5y6Rz@)ASjgp%}$!fX>o6I-hEY;Nk&~$v64^Ei_5Uy^R%_kZQY)aj&$V-a(5y$Vf6`-%j24EdTQf z{wJ1KU%hALNsD7XT{a_;qo>^#w^^uXrL6*Y%~Al}I%?qE<-=#B4*Cj;d$>5T0h}9iysT z#-ti@E8f=74@Xsnj7e2F=2X0{p?8isms4ZT=9vvr(_^aYs=SoiD9@_su^Xk@++znb zA$6(8ZpoI`FTHlBJ2NcdXw;5KxD&Oz+&M<7q0gT5N%_|qyG;Tgq+LQ@oTprh*_CeF q(7(p)YIkg{gs!+VTb}<~+!*/ { a[0].inputs[0].setValue(a[1]); }, args]; + break; + + case "gif" : + if(file_exists_empty(txt)) + Node_create_Image_gif_path(0, 0, txt); + break; } + } - function doBlend() { // + function doBlend() { if(array_empty(nodes_selecting)) { nodeBuild("Node_Blend", mouse_grid_x, mouse_grid_y, getCurrentContext()).skipDefault(); return; diff --git a/scripts/scrollBox/scrollBox.gml b/scripts/scrollBox/scrollBox.gml index 0a69d8b30..72666e448 100644 --- a/scripts/scrollBox/scrollBox.gml +++ b/scripts/scrollBox/scrollBox.gml @@ -70,6 +70,17 @@ function scrollBox(_data, _onModify, update_hover = true) : widget() constructor data = is_method(data_list)? data_list() : data_list; + if(array_empty(data)) { + draw_sprite_stretched(THEME.textbox, 3, _x, _y, _w, _h); + + if(type == 0) { + draw_sprite_stretched_ext(THEME.textbox, 0, _x, _y, _w, _h, c_white, 0.5); + draw_set_text(f_p2, fa_center, fa_center, COLORS._main_text_sub); + draw_text_add(_x + _w / 2, _y + _h / 2, "no data"); + } + return _h; + } + var _selVal = _val; if(is_array(_val)) return 0;