From d42fa511a51db582849470316dfd1f0eee459350 Mon Sep 17 00:00:00 2001 From: hurikhan Date: Fri, 16 Jan 2015 13:49:46 +0900 Subject: [PATCH] rearrange the demo --- demos/misc/window_management/control.gd | 4 +--- .../window_management/window_management.scn | Bin 3897 -> 3931 bytes 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/demos/misc/window_management/control.gd b/demos/misc/window_management/control.gd index c867bd21dbc..043db8d4890 100644 --- a/demos/misc/window_management/control.gd +++ b/demos/misc/window_management/control.gd @@ -19,9 +19,7 @@ func _fixed_process(delta): get_node("Label_Size").set_text(str("Size:\n", OS.get_window_size() ) ) - get_node("Label_Screen_Count").set_text( str("Screens:\n", OS.get_screen_count() ) ) - - get_node("Label_Screen_Current").set_text( str("Current:\n", OS.get_screen() ) ) + get_node("Label_Screen_Info").set_text( str("Screens:\n", OS.get_screen_count(),"\n\nCurrent:\n", OS.get_screen() ) ) get_node("Label_Screen0_Resolution").set_text( str("Screen0 Resolution:\n", OS.get_screen_size() ) ) diff --git a/demos/misc/window_management/window_management.scn b/demos/misc/window_management/window_management.scn index befc177b5e09d4c07cc3657e1cc5da662998c3d3..a83897f9a08af20a0ee92b9f52f8c358fa1b1ab7 100644 GIT binary patch delta 1939 zcmXw)4@?{96~N!!84m1#lU%?70({0eV4MgN(vrba-u=OUlD3&3G))NH+2#Nj;v=>x zX&TKAY11rPMK)JWCsfU;re%1P|1^E}E==6}n6y{&kZj7iyuytZJYy zgNDE_m3yvpkPzd*kyv0A9llSS{>8@Bh;t2+TCFsZtA$w8b0%A>Y{OddGv?V)s&$f$ zB@^R6gI?0FusKj%EI=BoO%}{5d+-dtDtZ|X(i371)bQoqe`cqrX55{ix<6o(dcxx| zxz^yD&g!=9S~VWQ@8f6hF5mz{&T(ZVeG6yNfj@7qZ>x9i`1L{DiC<;*E7}lNA}4mk zv}-lRO{s}k(|<6IfVIfMxz-;|baIERb8+4{GD}Tc6@*q2^kGZb47TCCv^n|gWJ^y>6&0-Ur3;Y6iZ~zbGVnE=J z$W!HjgaU>g+_O=A_VDcs)mSg;;xIaK$sKv=MCRY6ZLRa6M;6ZqUl9qT$3ABE=D9)K zz((&VJ7J6mn@mds&NI`-H>NXB^4{imm+LPdldmk@L|P;Wwf*)7FH7&_>Vq5?IvtMs zZ5Q91jAdTuYlc@$OHkg_YCM{Ii)pEoUx0I;z+2qiJ9iG@k;7MW-{BJR@vyd^CS;e~ zPj;m_Y@0I3JmeWPQoF81uX>d68+k4s%=9{CQ~+3QBG$H1|sq3bW;0v zrlP!Qiw|t1ob%00O3v-;?O$<#m~eUO2lrsvpPiGpfb1r7EaNrRAO z=L6`-`ry6n9(btfW@$6*%QnLnibYFEPm~^y#zu`Qw6y; zrh_=EzZktFkn9Zn{lbe(Zkx8pWR6pl3E$1N!4)lQGDqqBlpHlnuF;k2rG5AT#9V`1 z0tn0_uK&$4;mu z?Z|^Y%i|>4Prtp1yUOa&^R1*c~!9jSOm!HCUWe%5> zdzp`{1;(Fw&$g7xuE|H&9P=or{kc#3SmAgy~rHu8@9aGZF>`zv1Yf$weHygiFNZu)NK>mEo8>%42F zj(r+nYy(aZ-sgprSw00rSsqRi-p|7@;l+Q#NS5!L_jmTq`ny1-hvOLy(k&38Zeber zA#JPs2%-QHQU;$B$ae{WYtrVT;J=km2!XCVC*WqjQD8w4b zB-|F(xE{$N_pI>2)DPvJ;6h#&EC*q6IkmlqH=UbW-&qtr$;hV8h3`YoF-dfif}oHayRFIn8`Yn edsHx}0OiC+#c6u?OCc(qp%1zKfquF8C;l&g&pyro delta 1917 zcmX|C3v5%@8UF9Rj&BkNo5du~gCxgsOkRTo5}Gs&@?YQUN1!ZgvNkP&-fPD<#!I*k zek7DcvlF_Jv8qvJb!BBLUZ-`^I%(_Jh8WsvlC^sP>bgo)RX6n*mp-OdbVBN;NfSFp zXjl4<{{Q>VfAl}j(S5J^Qgi*-xGY2I+YF#@19(pam@fnP!>jeHrZ!qp4Ld`k>7igq zpCw0JzxEy1tlIULJfU8>R{uKJbIko*_NvL5KAW)#`iVJJIjEiG;<5IqdqQi2L{KM{ z60iJ545pH?g?MmIdy-4dxt`s2=qWE++CBhvs>%J9w4iO6)UU)6QRlm0XwPPPUAXQ0w^o{0qPfmcidd+*bL9aFozUcZhVuTK;GsbL|D-%w?uTAl)69;6 z=D;5n>iPyGq^Ch3M&MI)`0l#QyrE77ml@OGS;;qm(VC@vgM0%UJn7Bce6VAlHpG(P=J#imyhlf_EtuQakJF#-c2jE2a;TD`kVh2q5AI|2cQ1c2KJ($9l|B~ zGu(_8=*z4sx3OA|@nL=1_2Z7u`FJeZc?`$+rFV(8fUR&cuz_0yfd9y)fWXHnGN<2z z4R#C(^HF_a|DTs@u}RXUBk06+w{be0y=(63cpI^Wr8~wS zjYUSbQ&TgpadWY6EoL7UyW9S<(X^_{XVx!clj{@&yZ-i*vz|-&Chvd{JQj-j-KSoj zc`}<5>$SJ2X+*xG)pyRgtEj0_ehNctRY+FF|sw2 zRfgcilusP;9Uo?Q99rtwqN;j0nvBKOc*;-{dNLU`A_-N62FTWy%R>~VO>9t+D2bY; z;<|2-2oewpDI1@PN9U5-0C2>LFCc&kO$6`^8`%VW0jsjlm#4}KycIvp)>pJv?FS2~ z5PYfG*=05Buh^cxUFM6P(8J@DtB3x~AO{DvK`18`&exqcpf~p*9L}{sike$sCo`%T zOj^)0Y@Uc3;n;$nFTzc&4o{Ys9!@eEGlp_QP_K=F8RKLvUjvd>gMrK{B=U6-rBG*< zQ}MWNB$>OCTY+?D`5>2B)jGHu$V*%=aa!)ZtVJN1B`)(lt&O(>j;i`cE~KoK^Php-QbQ;f8Vp6VOOn@H}i~{8eaT>jh}e ziR>K6+AME!O7?xrdYbMidIc&Jy%u_)cvF1EJ44%xFkYhHEYa`K$)az7x{B}!c^|$? z1SKJ>w;U7jDCt&y`bMKS;`_lZA>xfO;{t8GN&(P z$-IBTVIoSm;Yd#Orv2S%Z^YjYPp|?ng33~C=QPNO5M(>AvisYDAlV^A%Hb}7!hk(+ z+9O`E`!5y}_CQae#|~44eRfYzL9hodGj61>#Dy96x_!NUY7is29uz{W7i zU}iYXAQE9O93cXVu%C#qi&0-@C}((r!Nj04wdMag!4~G;%Zhcw1bSAqHf>*o{+!6# zA>tm`&8z`-R2K^!WN2r2kfDxYh{f*7K5XqxFTe!beW%nNw3WJ3Xtd*nQtHzra=%ik zofZB78I|l(535Z2QAv)Fjr%g2s-IPjmXh{-Njple-q&zg64%=$8?s!BGkY*mlB47o zB^lrTpl@+h>1MG?AB$C9DY)!V<`k97=Bb!ruxm^