From e22101bc11dad724eae49290d81b81909b2cdb60 Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Wed, 3 Sep 2014 11:51:45 +0100 Subject: [PATCH] Draw green rectangle when command is selected --- .../Editor/FungusCommandListAdaptor.cs | 15 ++++++++------- Assets/Shuttle/ShuttleGame.unity | Bin 122140 -> 122244 bytes 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Assets/Fungus/FungusScript/Editor/FungusCommandListAdaptor.cs b/Assets/Fungus/FungusScript/Editor/FungusCommandListAdaptor.cs index 681e4e66..8e59519a 100644 --- a/Assets/Fungus/FungusScript/Editor/FungusCommandListAdaptor.cs +++ b/Assets/Fungus/FungusScript/Editor/FungusCommandListAdaptor.cs @@ -116,10 +116,6 @@ namespace Fungus.Script { GUI.backgroundColor = Color.red; } - else if (fungusScript.selectedCommand == command) - { - GUI.backgroundColor = Color.yellow; - } else { GUI.backgroundColor = commandInfoAttr.ButtonColor; @@ -156,10 +152,15 @@ namespace Fungus.Script GUI.Label(summaryRect, summary, labelStyle); - if (Event.current.type == EventType.Repaint && - command.IsExecuting()) + if (Event.current.type == EventType.Repaint) { - GLDraw.DrawBox(position, Color.green, 1.5f); + if ((Application.isPlaying && command.IsExecuting()) || + (Application.isEditor && fungusScript.selectedCommand == command)) + { + Rect boxRect = position; + boxRect.y += 1; + GLDraw.DrawBox(boxRect, Color.green, 1.5f); + } } } diff --git a/Assets/Shuttle/ShuttleGame.unity b/Assets/Shuttle/ShuttleGame.unity index 9d3375936f1035782d5d662b2d131e1f2183996a..05fcc0d2e830a4900268d75f2379e7cd2e76ea33 100644 GIT binary patch delta 2964 zcmZA3Yiv_x9LMqhkty8^p(>a~5k~?tVMBx{i;`FnwQ}v|7#kBd#$^Mx(T%y4i#r3k ziChW+T9mNLCD{v1X2f*SXdp2Gqls05@J6ZQR&Fv9!6m5k`*i1&=XBYVcAx$J&vTy3 zIqiY3`fvEUzgvu{C&l<}gNS7EKEBTVrQ3Ki&nS$J%rim*%}hgt-((veDDs7iL^2+t zVXBS5BE=%AgFC&wy$!rRhvm!>@$&vp%SK}UG|Ry{)9iUnN<^mg)tbo;M}b~Y?{G90 z#3pKkBv7EZIV0kg<=9@GbUkzm$bXYn}IA*ScXs}9q0 zuf4pv@I3Z81KX?W!GdKX0qmZ&T9Yu>yCQxQ?6z<+7y$L)>sU9YmjAYuo1${_L=I>j zzJX=U7x7_tt=yYfHTIpB^I~JmMIu-aIaBTD+h7c2>r?x_Z^Dt{oC=Wzm_3sa7R1yA z-m(S>V=h8mW2$yX?wL8&*!x=TPAq|`iNviI%spey@mGoj8R4eY;Vy!*h@~O)k7c_t zKQ;vW-D-afyE-?BeZ$|BCtDZhTijP`uj)nY1QsNtW~?TBN#&NP3A6qgfNGb)c98QW zH>}_lOsbsAdQ}x;f048IGl6-l`&RI}ReKGKV0!L47G5d>%Qcl#`+ozJWqpGrtm66Q z1Im0@0spsWSB|w~`Zl@m<(J8F5&BH!9>e_D9xQIP$1zup$SeGP!D>%nrWc$7{AUgP z(a=+6K};Wb8&v^-a_2B_T{35;mj8?6cgrK7KJam@ zr!Sbw)o$#n@U3v>>acc9AJ{m{+2s(`@G!g9udkKfp1Hu!0eCP5>pvGf4eG_-QL`(v zSL#9T5-fn}xu*{7t&FARp2l(-ow;YK4pz2e`Zf*4x=m0&>Cb`{?}@Cn_ASn9HWtV9 z)Bo+|(F>(Xq=Um@&u+$&qYFElMK)4npP89hKKJVet-o2=39ONj`LDI_J{4T;yqE&4 z9rICq-^vwYJ(zwmu{*CW%334BU6va7XRH;|C-MuXK%1~BXFxxwcX;Z;sp=s1V4p-z zV+l-O{=Cxoat}`#JvRmmV|uR5`)N&gS}uZlTiAa+SkN}LHqzqkun_CP^xRJ!6a7AF z^?_qpds=_<9&PqZt1~wrE5VZekx!oNmZ1acJJNzC=33_*cxl2@UxA&Zj_pgfWmwL7 zXKp#xim83SYHeK&=K6qr$F5jr)~a9{)?qzZD?$5_xdIE&o7y|O*pDSJ^)$O|by$!2 zIDxt~V4avcNA`!)O3by1=kFfSevEFK6{?SH5}AkDv)hcxX6Nj-U?tdea`pul^adN+ zv3jkx5X;`;IB@a~7Q{G8JRMp8IB$wT_lM3y*qmL^I2O}yrvTQ8sby7ls;$C2Tb*~w zYAlGUTg<-0)?lt}&Wl-Vf&p*{9oe63p{laRFt!S_S0RjLZ5PSME?G;xAM;^qOD=^2_`$7D_B)LuBikwXKRC0gB_qgyS>L=YRcc~Ji+_0AeKDA)MwDPoo#DM zq~*3_o}e=~V8r>RFlOC3Wyu*11iRCMgKif$dv~RR$=qNpg6RX_{On>&Pg?F4=Gz_h zzh%_*i*`*lE@eHOJvsK{*60rljdSCT-00zu@% z$T!W%i2Bo$8JH7AT?GL&nHx#vx;RzfkOmF+6na Zura7VA39RJpdmDAnlU)K=%~>-;eWE|0$Kn7 delta 2895 zcmZA3du&rx0LSrjVG8^qR7Ep&;!H#)Fhq>fD2WwO%7W0%F$QyNY{&*|V}rSs*Dm0I z$+H+(ixO6iB>h8@8Zadq%}h*&35ivLkQkxzEH4>GNE5~RJ?**W-22DLZa@8<_qk{7 z{AS4huZOsVQFKTczvl@dhVdNV;QGpCJX&ZJ$Ho*I!4c+NzA#jI#$W2|DitDU5CxNE zG!`fmVlB_N1_lOJ@b_8FHCG5P&wnZ#gOxk101G?pIV_1y%hWZ~4UPpTmfIT~hxxH7 zS|{VNqYf*?QkZHm-QEPuGfxPQR`+>qy~8H@%~D@4sCV)LK{4N6d6H}p({r!AyrpD4 z_9dNIE9k-86+-y2J8ETK$D&v>)~{?Tmj5m}QwzQUhQLnjrV37z!Ac?aYq>YEUd)Hx zR=Kw@*8(Aa&~jevG#18EDmMf3R|&x`r?=P4;h}r-=VftlA?8- zsPf0tm*=~&Z~1Hu@En%H^kqGd)xSq4I#C(f|C>N~%HP!JYFaqk! zdRbP+{-%<(pGmC0F4N#uRrdJz~YL^UBe=n>?0{n?*D?S;T0*cm}hHt zRhVz7eblZy?urOTG@E-6%UveK9xS2CLs%4hh0kYIc^K=*rt$edHJELq`YKF!gT3SJ zU;xvXE3~?~D(T4W!#s`l+^@qnR)sKqBB!u^NAB>E+g0ACbk5AqjVJ^3oKA8DfGj^{J*55mJPR%h#a0ZsYQV$C8 z`2M{$eoSxh2`ui&Jz004rl8fnO{1_7CJ(E1(4WGFn(t?>)&yV3k`H!a`sx4f;<(xf z7UghQvwM5-!P@e6AvRIRIy1Ad1lFnAlI_jL>bZ?t3Efru?vuGynZcOWXo^AK>deXf zM+Hl;Fs2VCe(Tjmy%=v)w&S0%f;IMu{DMU=ea0uS+_kp$Owo6?uig#n%X$n8VE6V( zh{Ab^Wl2YF0_Nf7(Q`fCPa8s*-d-5%cjStDiW4L^P}XP zvQMxGrk{_xvPo@Xrx0_rKI*Y@%w+r07f*t}d%t+8EdlB$y&H4yvNyQ>WKUZF({nqp zq$4+c^yxNFz@8g{g)lY1>FFO5BX5?q_d9}*VBX!?U^;jG(D{xqrgwY;OYM$zPB)qc z2NOj`PVBED<3jFzIaA}uyJEl98mC?~3S)