From 9837aa652e245594d89c487b0f19d9b64f876404 Mon Sep 17 00:00:00 2001 From: Ray Date: Sat, 24 Feb 2018 20:26:07 +0100 Subject: [PATCH] Some tweaks --- tools/rGuiLayout/default_light.png | Bin 395 -> 0 bytes tools/rGuiLayout/icons.png | Bin 0 -> 2441 bytes tools/rGuiLayout/rguilayout.c | 41 ++++++++++++++++------------- 3 files changed, 22 insertions(+), 19 deletions(-) delete mode 100644 tools/rGuiLayout/default_light.png create mode 100644 tools/rGuiLayout/icons.png diff --git a/tools/rGuiLayout/default_light.png b/tools/rGuiLayout/default_light.png deleted file mode 100644 index 97c50eaf2ac449a276d96fdf658d39f3c9afb14a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 395 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!2~2VTi?|IDb50q$YKTtZeb8+WSBKa0w}1E z>=ES4z)+>iz|hdl!0_`wkbcR)P-?)y@G60U!DJISbAQFr&*J$CaUVO2pMN}IWXMx!@Wl2&llDy& zH8r96IZ4iQI{eK#H!>bkm*!S>zGUODZYKLAHI9zzCtjy2zuc?F8|Ci#7 zX%jBXR?c_PV@_gE-c%JIa6IRn#8_5X0bg)FK;({O1D958lcoG3=S^ k%;S&^zopr06u4u2><{9 diff --git a/tools/rGuiLayout/icons.png b/tools/rGuiLayout/icons.png new file mode 100644 index 0000000000000000000000000000000000000000..1afecec31a86115f68f5d1e08b09489c039ca7fb GIT binary patch literal 2441 zcmbVOdsGu=7XN0FKtzEQ5MQ7}Sd}7>Ng%WDD~PPgv0SFVN85GJ*xEWcGZ_wz3%--5M zCZbUZnJc)lXsjUuS8F0OjQH}5CGpCPO-jCsDf$ozOB0X=w76M;q-j%hCPA8zIc`@# z&h6VQCNeH!-Xvtc29*#iMkzv|#d>|JS;!=jz79cah>d+~SZ8`e6iFE?O<`cMgHV=M zYmaMO+GLKy{|Dop(x&)y1I~)WP5M-$lFUc4?}ReR-5)!$3zBFAON|;bDT)+KuT0hA zI&%~zWRfRADve4IB9X}WD9V?GqL`G+W-km0=gOpLe`E#-#GxI7708XArTb9kY$g%i3_I+IzUQ{oeTHKgA+y1{>_D~K@S3bWoAuh*wc zRDfKqH|tGmy#a|>&P7&ebSk~YWKYiPSTWqF*@CNNM!gmpXIG$khxdrka6S*iq$nSi zjz=BNmq{Z~jLqS4Bf`;e<{Mqr|HBxI1jDkI#_vjHVvDRl`}A$$lZ&^lgX_qCF_Mij zVDdQt0IfC(lfrW(DJ-@RZuy`|+@ z`z_mx{QTSi4^b3V45(rs0MqB)jF}5RrB&^438$3Wy(gxBce^r!AV69dU9!8j(8Wp%_DJ{d%2znTpfG(hs1)z|^4AE^uy5rZe_MFtllC*;uK#4LbuEYtTXSIPze3ChcE*>-Q__v_U-Zl*N*T@AU~l` zEV$~l8+fe}LDOLa-}@7@-qJF%1I(kz1=$QSM0l<^7&1&Lx}2TqC@(q`c-_r*Hw8rZ zr;3h$UjEP7*3&P*(nDMLH5VIyp$qD#7<<9WL`kxB5f%N{X*;j8RFiY*-?|0lQ_m1ez+G6MBp|C z#s-GEGfxfacSZXuKOU=ME8K^y9B_KhpU;FHn=|#;8mEzr^sLS0J367>oT+;px}hs) z=VhG_tFvTbU6=a)+mSw_s=xT6Yr~z)sX1#Oo$3F+kAetG&F!`~;m=}Dn*=AmIKEeMlUIiVyqroEU ziR%Km>eQ_|7x&{0Aj!R|s4O?Qz=Lm=!eCWa1+A*E!KtG=N%r#gug~+!<6?UpcVT%6 zyqKmC016T<-_H2v%H?lF=hyAq-^Sg0?@yM+{YO6v3mWS!+PwI?I7c~5X*=#=r;TjG zQj%7=olgp-dY$Lpl|wzcmajv>W8+Q-Bs$~+AFvJ-ot?s`O1D3J)cyUDmczLfz=nU? z+tON?I4}wcpAnvd$XdxdZ&6$BgBAwjB1~E!JeXKy3ZuD+lBi(2q~qb)`Mxfa`{%oIQN*E@9 ztR-t38M`>Ih8)_ow7np=hWc-&tD$p}ID7DrqrsNfvqUqnnlVwY;jb^4@yK9E+$=eI zeRcaZuQDHBO2ua3$CRXJ_g`fU6c=5r=4SolUy&f%pW)rZd%iJc%i05!gjKKR;CZd1 zUU%F}XGPoq0Zt{nSNmP=N+0LAP1D_>Fr-J8I`@B4*DLfU;`_yb$8VAQx;L z=PbndTVI^I;G}?SOYbaqtsX1+YJ}E+=+I$m;QaNEY}KKsbQf9G zS?4o0f9i0s%Tt6n5ndhBIu7tW#5(xC{Qb`IMMne2G?RkPX`}Wvw%BmX?{1?V?~hTZ Z0}rhE+$BoQRr}9TlynL9ZFth>zXAWfh}!@F literal 0 HcmV?d00001 diff --git a/tools/rGuiLayout/rguilayout.c b/tools/rGuiLayout/rguilayout.c index 32ea525..784a782 100644 --- a/tools/rGuiLayout/rguilayout.c +++ b/tools/rGuiLayout/rguilayout.c @@ -74,8 +74,8 @@ typedef struct { // Global Variables Definition //---------------------------------------------------------------------------------- static char currentPath[256]; // Path to current working folder -static int screenWidth = 1280; -static int screenHeight = 720; +static int screenWidth = 800; +static int screenHeight = 600; static GuiControl layout[MAX_GUI_CONTROLS]; static AnchorControl anchorPoint[MAX_GUI_CONTROLS]; @@ -173,23 +173,26 @@ int main() "COLORPICKER" }; - const char *guiControlsCounter[12] = { - "00", - "01", - "02", - "03", - "04", - "05", - "06", - "07", - "08", - "09", - "10", - "11" + const char *guiControlsCounter[16] = { + "Control 000", + "Control 001", + "Control 002", + "Control 003", + "Control 004", + "Control 005", + "Control 006", + "Control 007", + "Control 008", + "Control 009", + "Control 010", + "Control 011", + "Control 012", + "Control 013", + "Control 014", + "Control 015", }; - GuiLoadStyleImage("default_light.png"); - Texture2D texture = LoadTexture("default_light.png"); + Texture2D texture = LoadTexture("icons.png"); // Get current directory // NOTE: Current working directory could not match current executable directory @@ -579,7 +582,7 @@ int main() { case LABEL: GuiLabel(defaultRec[selectedTypeDraw], "TEXT SAMPLE"); break; case BUTTON: GuiButton(defaultRec[selectedTypeDraw], "BUTTON"); break; - case IMAGEBUTTON: GuiImageButton(defaultRec[selectedTypeDraw], texture); break; + case IMAGEBUTTON: GuiImageButtonEx(defaultRec[selectedTypeDraw], texture , (Rectangle){ 0, 0, texture.width/3, texture.height/6 }, "IMAGE BUTTON"); break; case TOGGLE: GuiToggleButton(defaultRec[selectedTypeDraw], "TOGGLE", false); break; case TOGGLEGROUP: GuiToggleGroup(defaultRec[selectedTypeDraw], list, 3, 1); break; case SLIDER: GuiSlider(defaultRec[selectedTypeDraw], 40, 0, 100); break; @@ -602,7 +605,7 @@ int main() { case LABEL: GuiLabel(layout[i].rec, layout[i].text); break; case BUTTON: GuiButton(layout[i].rec, layout[i].text); break; - case IMAGEBUTTON: GuiImageButton(layout[i].rec, texture); break; + case IMAGEBUTTON: GuiImageButtonEx(defaultRec[selectedTypeDraw], texture , (Rectangle){ 0, 0, texture.width/3, texture.height/6 }, layout[i].text); break; case TOGGLE: GuiToggleButton(layout[i].rec, layout[i].text, false); break; case TOGGLEGROUP: GuiToggleGroup(layout[i].rec, list, 3, 1); break; case SLIDER: GuiSlider(layout[i].rec, 40, 0, 100); break;