From a0400b6ff7b154417838f16fcdd07dc241eb0cf8 Mon Sep 17 00:00:00 2001 From: Ray San Date: Mon, 9 Apr 2018 09:05:13 +0200 Subject: [PATCH] Review layouts and examples --- examples/raw_importer/raw_importer.c | 4 -- examples/raw_importer/raw_importer_REV4.png | Bin 0 -> 4507 bytes .../raw_importer/rguistyle_default_dark.png | Bin 1241 -> 0 bytes tools/rGuiLayout/layouts/image_exporter.rgl | 16 +++---- tools/rGuiLayout/layouts/raw_importer.rgl | 45 +++++++++--------- tools/rGuiLayout/layouts/rfxgen.rgl | 2 +- tools/rGuiLayout/rguilayout.c | 10 ++-- 7 files changed, 37 insertions(+), 40 deletions(-) create mode 100644 examples/raw_importer/raw_importer_REV4.png delete mode 100644 examples/raw_importer/rguistyle_default_dark.png diff --git a/examples/raw_importer/raw_importer.c b/examples/raw_importer/raw_importer.c index 7b3c472..2626fd5 100644 --- a/examples/raw_importer/raw_importer.c +++ b/examples/raw_importer/raw_importer.c @@ -18,7 +18,6 @@ #include // Required for: strcpy() #include // Required for: atoi() - //------------------------------------------------------------------------------------ // Program main entry point //------------------------------------------------------------------------------------ @@ -56,8 +55,6 @@ int main(int argc, char *argv[0]) int format = UNCOMPRESSED_R8G8B8A8; int headerSize = 0; - GuiLoadStyleImage("rguistyle_default_dark.png"); - InitWindow(SCREEN_WIDTH, SCREEN_HEIGHT, "raw image importer"); Texture2D texture = { 0 }; @@ -146,7 +143,6 @@ int main(int argc, char *argv[0]) } if (imageLoaded) imageScale += (float)GetMouseWheelMove(); // Image scale control - //---------------------------------------------------------------------------------- // Draw diff --git a/examples/raw_importer/raw_importer_REV4.png b/examples/raw_importer/raw_importer_REV4.png new file mode 100644 index 0000000000000000000000000000000000000000..80e0713f0f80158d4740e11afe2138d2291e8bb9 GIT binary patch literal 4507 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 G`hNkYVcRDF literal 0 HcmV?d00001 diff --git a/examples/raw_importer/rguistyle_default_dark.png b/examples/raw_importer/rguistyle_default_dark.png deleted file mode 100644 index 65bd79e2caf7dd7edd7096d6d7624ec62fa5c108..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1241 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!2~2VTi?|IDajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_cg49qE+ArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8 zNvY|XdA3ULckfqH$V{%1*XSQL?vFu&J;D8jzb> zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XP}#GU}m6TW~gUq zY+`P1uA^XNU}&IkV5Dzoq-$tyWo%?+V4wg6Nh+i#(Mch>H3D2mX;thjEr=FDs+o0^GXscbn}XpVJ5hw7AF^F7L;V>=P7_pOiaoz zEwNPsx)kDt+yY-;xWReF(0~F4nSMoLfxe-hfqrf-$X{U9#U(+h2xnkbT^v$bkg6Y) zTAW{6lnjiIG-a4(VA$ce2&53`8Y};zOkkuW=D6f1m*%GCm3X??DgkBmQZiGlEG-Q! z9UaZhjSQWQT+Iy)ot&M_T%BAj-JC2e4Gmo^VP;^{Yi4O_;%e^b=xk(UYG?>#S(v#w z8W>v|J31OVnHxL8^m^tMmn7yTr^4*b1lkMLYl&B{m2**QVo82cNPd0}ECmE)=F@2z8 z^g&4jDXGAOfawp!geQC;2cC6O^MLuK2$(U_n@ztlFfej^x;TbZ+)DDv^Gua!dT?ah zY5_KGqjrT2A1=wMbUn-w<4Aq=&?n&bOWA5gp2;mXOox zcTNEx&&{o#uv4et+SFS24;hyWH#t6wySYnneo}sY%DW|!%RgwGJ8j_nOzu{_M1PXC zd$ft5n$4=@qOMN=DH(mo_>*e3co; # Control info: c # @@ -13,25 +13,24 @@ a 004 0 0 0 a 005 0 0 0 a 006 0 0 0 a 007 0 0 0 -c 000 13 0 0 200 452 1 RAW Import Options -c 002 0 9 50 80 20 1 File size: -c 004 0 19 100 30 20 1 Width: -c 005 0 19 125 33 20 1 Height: -c 006 0 149 100 30 20 1 pixels -c 007 0 149 125 30 20 1 pixels -c 008 11 59 95 80 20 1 SAMPLE TEXT -c 009 11 59 120 80 20 1 SAMPLE TEXT -c 011 0 21 188 63 20 1 Pixel format: -c 012 9 20 202 158 21 1 SAMPLE TEXT -c 013 0 20 238 50 20 1 Channels: -c 012 4 20 251 156 20 1 Bit Depth: -c 013 4 20 292 156 20 1 Bit Depth: -c 014 0 20 279 50 20 1 Bit Depth: -c 015 0 19 366 22 20 1 Size: -c 016 0 149 366 30 20 1 bytes -c 017 11 59 361 80 20 1 SAMPLE TEXT -c 018 1 9 411 180 24 1 Import -c 019 12 9 346 179 49 1 Header -c 020 12 9 175 179 150 1 Pixels Data -c 021 12 9 75 179 79 1 Resolution -c 022 0 9 30 54 20 1 Import file: +c 000 13 0 0 200 475 1 RAW Import Options +c 002 0 10 55 80 20 1 File size: +c 004 0 20 108 33 20 1 Width: +c 005 0 20 138 33 20 1 Height: +c 006 0 145 107 30 20 1 pixels +c 007 0 145 136 30 20 1 pixels +c 008 11 60 100 80 25 1 256 +c 009 11 60 130 81 25 1 256 +c 012 9 20 195 160 30 1 SAMPLE TEXT +c 013 0 20 250 50 20 1 Channels: +c 012 4 20 265 159 25 1 Bit Depth: +c 013 4 20 315 159 25 1 Bit Depth: +c 014 0 20 300 50 20 1 Bit Depth: +c 015 0 25 388 22 20 1 Size: +c 016 0 147 387 30 20 1 bytes +c 017 11 55 380 85 25 1 4096 +c 018 1 10 430 180 30 1 Import +c 019 12 10 365 180 50 1 Header +c 020 12 10 180 180 170 1 Pixel Format +c 021 12 10 85 180 80 1 Resolution +c 022 0 10 35 65 20 1 Import file: diff --git a/tools/rGuiLayout/layouts/rfxgen.rgl b/tools/rGuiLayout/layouts/rfxgen.rgl index 823cc83..1c2c377 100644 --- a/tools/rGuiLayout/layouts/rfxgen.rgl +++ b/tools/rGuiLayout/layouts/rfxgen.rgl @@ -2,7 +2,7 @@ # rgl text file (v1.0) - raygui layout text file generated using rGuiLayout # # Total number of controls: 108 -# Anchor info: a +# Anchor info: a # Control info: c # a 000 0 0 1 diff --git a/tools/rGuiLayout/rguilayout.c b/tools/rGuiLayout/rguilayout.c index 9c6366a..5d5c0b7 100644 --- a/tools/rGuiLayout/rguilayout.c +++ b/tools/rGuiLayout/rguilayout.c @@ -26,7 +26,7 @@ #define MAX_GUI_CONTROLS 256 // Maximum number of gui controls #define MAX_ANCHOR_POINTS 8 // Maximum number of anchor points -#define GRID_LINE_SPACING 10 // Grid line spacing in pixels +#define GRID_LINE_SPACING 5 // Grid line spacing in pixels #define GRID_ALPHA 0.1f // Grid lines alpha amount #define ANCHOR_RADIUS 20 // Default anchor radius @@ -1125,7 +1125,9 @@ int main() if (snapMode) GuiStatusBar((Rectangle){ 249, GetScreenHeight() - 24, 81, 24}, "SNAP ON", 10); else GuiStatusBar((Rectangle){ 249, GetScreenHeight() - 24, 81, 24}, "SNAP OFF", 10); GuiStatusBar((Rectangle){ 329, GetScreenHeight() - 24, 80, 24}, "Tab - Help", 10); - GuiStatusBar((Rectangle){ 400, GetScreenHeight() - 24, GetScreenWidth() - 400, 24}, FormatText("Selected Control: %s (%i, %i, %i, %i)", controlTypeName[selectedType], layout[selectedControl].rec.x, layout[selectedControl].rec.y, layout[selectedControl].rec.width, layout[selectedControl].rec.height), 15); + if (selectedControl != -1) GuiStatusBar((Rectangle){ 400, GetScreenHeight() - 24, GetScreenWidth() - 400, 24}, FormatText("Selected Control: #%03i | %s | rec(%i, %i, %i, %i)", selectedControl, controlTypeName[selectedType], layout[selectedControl].rec.x, layout[selectedControl].rec.y, layout[selectedControl].rec.width, layout[selectedControl].rec.height), 15); + else GuiStatusBar((Rectangle){ 400, GetScreenHeight() - 24, GetScreenWidth() - 400, 24}, "", 15); + EndDrawing(); //---------------------------------------------------------------------------------- @@ -1235,8 +1237,8 @@ static void SaveLayoutRGL(const char *fileName, bool binary) // Write some description comments fprintf(rglFile, "#\n# rgl text file (v%s) - raygui layout text file generated using rGuiLayout\n#\n", RGL_FILE_VERSION_TEXT); fprintf(rglFile, "# Total number of controls: %i\n", controlsCounter); - fprintf(rglFile, "# Anchor info: a \n"); - fprintf(rglFile, "# Control info: c \n#\n"); + fprintf(rglFile, "# Anchor info: a \n"); + fprintf(rglFile, "# Control info: c \n#\n"); for (int i = 0; i < MAX_ANCHOR_POINTS; i++) {