Update Makefile

README.md

@@ -10,7 +10,7 @@
 
 <br>
 
-**WARNING: Latest `raygui` from master branch is always aligned with latest `raylib` from master branch and all raylibtech tools. Make sure to use the appropriate versions.**
+**WARNING: Latest `raygui` from master branch is always aligned with latest `raylib` from master branch and all raylibtech tools. Make sure to use the latest versions.**
 
 **WARNING: Latest `raygui 5.0` introduces some API-BREAKING changes, now all functions return a result value.**
 

examples/Makefile

@@ -324,7 +324,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),OSX)
         # Libraries for OSX 10.9 desktop compiling
         # NOTE: Required packages: libopenal-dev libegl1-mesa-dev
-        LDLIBS = -lraylib -framework OpenGL -framework Cocoa -framework IOKit -framework CoreAudio -framework CoreVideo
+        LDLIBS = -lraylib -framework OpenGL -framework Cocoa -framework IOKit -framework CoreAudio -framework CoreVideo -framework QuartzCore
     endif
     ifeq ($(PLATFORM_OS),BSD)
         # Libraries for FreeBSD, OpenBSD, NetBSD, DragonFly desktop compiling

examples/controls_test_suite/gui_value_box_float.c

@@ -1,71 +0,0 @@
-/*******************************************************************************************
-*
-*   raygui - controls test suite
-*
-*   COMPILATION (Windows - MinGW):
-*       gcc -o $(NAME_PART).exe $(FILE_NAME) -I../../src -lraylib -lopengl32 -lgdi32 -std=c99
-*
-*   LICENSE: zlib/libpng
-*
-*   Copyright (c) 2016-2024 Ramon Santamaria (@raysan5)
-*
-**********************************************************************************************/
-
-#include "raylib.h"
-
-#define RAYGUI_IMPLEMENTATION
-#include "../../src/raygui.h"
-
-#include <stdio.h>
-
-//------------------------------------------------------------------------------------
-// Program main entry point
-//------------------------------------------------------------------------------------
-int main()
-{
-    // Initialization
-    //---------------------------------------------------------------------------------------
-    const int screenWidth = 800;
-    const int screenHeight = 450;
-
-    InitWindow(screenWidth, screenHeight, "raygui - controls test suite");
-
-    float valueBoxValue = 0.0f;
-    bool valueBoxEditMode = false;
-    char valueBoxTextValue[32] = { 0 };
-
-    SetTargetFPS(60);
-    //--------------------------------------------------------------------------------------
-
-    // Main game loop
-    while (!WindowShouldClose())    // Detect window close button or ESC key
-    {
-        // Update
-        //----------------------------------------------------------------------------------
-
-        //----------------------------------------------------------------------------------
-
-        // Draw
-        //----------------------------------------------------------------------------------
-        BeginDrawing();
-
-            ClearBackground(GetColor(GuiGetStyle(DEFAULT, BACKGROUND_COLOR)));
-
-            if (GuiValueBoxFloat((Rectangle){ 25, 175, 125, 30 }, NULL, valueBoxTextValue, &valueBoxValue, valueBoxEditMode)) 
-            {
-                valueBoxEditMode = !valueBoxEditMode;
-                
-                printf("Value: %2.2f\n", valueBoxValue);
-            }
-
-        EndDrawing();
-        //----------------------------------------------------------------------------------
-    }
-
-    // De-Initialization
-    //--------------------------------------------------------------------------------------
-    CloseWindow();        // Close window and OpenGL context
-    //--------------------------------------------------------------------------------------
-
-    return 0;
-}

examples/styles/style_advance.h

@@ -11,7 +11,7 @@
 //                                                                              //
 //////////////////////////////////////////////////////////////////////////////////
 
-#define ADVANCE_STYLE_PROPS_COUNT  25
+#define ADVANCE_STYLE_PROPS_COUNT  26
 
 // Custom style name: Advance
 static const GuiStyleProp advanceStyleProps[ADVANCE_STYLE_PROPS_COUNT] = {
@@ -31,6 +31,7 @@ static const GuiStyleProp advanceStyleProps[ADVANCE_STYLE_PROPS_COUNT] = {
     { 0, 17, (int)0x00000000 },    // DEFAULT_TEXT_SPACING 
     { 0, 18, (int)0x9eadd0ff },    // DEFAULT_LINE_COLOR 
     { 0, 19, (int)0xe6e6e6ff },    // DEFAULT_BACKGROUND_COLOR 
+    { 0, 20, (int)0x00000006 },    // DEFAULT_TEXT_LINE_SPACING 
     { 1, 5, (int)0x917de2ff },    // LABEL_TEXT_COLOR_FOCUSED
     { 1, 8, (int)0xffb033ff },    // LABEL_TEXT_COLOR_PRESSED
     { 4, 5, (int)0xb0b0e1ff },    // SLIDER_TEXT_COLOR_FOCUSED

examples/styles/style_brick.h

@@ -11,7 +11,7 @@
 //                                                                              //
 //////////////////////////////////////////////////////////////////////////////////
 
-#define BRICK_STYLE_PROPS_COUNT  17
+#define BRICK_STYLE_PROPS_COUNT  18
 
 // Custom style name: Brick
 static const GuiStyleProp brickStyleProps[BRICK_STYLE_PROPS_COUNT] = {
@@ -29,6 +29,7 @@ static const GuiStyleProp brickStyleProps[BRICK_STYLE_PROPS_COUNT] = {
     { 0, 11, (int)0x8c9c9eff },    // DEFAULT_TEXT_COLOR_DISABLED
     { 0, 18, (int)0x71a8aeff },    // DEFAULT_LINE_COLOR 
     { 0, 19, (int)0xeff0f3ff },    // DEFAULT_BACKGROUND_COLOR 
+    { 0, 20, (int)0x00000008 },    // DEFAULT_TEXT_LINE_SPACING 
     { 1, 5, (int)0x568a90ff },    // LABEL_TEXT_COLOR_FOCUSED
     { 9, 5, (int)0x5e9095ff },    // TEXTBOX_TEXT_COLOR_FOCUSED
     { 10, 5, (int)0x639196ff },    // VALUEBOX_TEXT_COLOR_FOCUSED

examples/styles/style_pocket.h

@@ -31,7 +31,7 @@ static const GuiStyleProp pocketStyleProps[POCKET_STYLE_PROPS_COUNT] = {
     { 0, 17, (int)0x00000000 },    // DEFAULT_TEXT_SPACING 
     { 0, 18, (int)0x56591eff },    // DEFAULT_LINE_COLOR 
     { 0, 19, (int)0xd9d9ceff },    // DEFAULT_BACKGROUND_COLOR 
-    { 0, 20, (int)0x00000018 },    // DEFAULT_TEXT_LINE_SPACING 
+    { 0, 20, (int)0x00000008 },    // DEFAULT_TEXT_LINE_SPACING 
 };
 
 // WARNING: This style uses a custom font: "GMSN.ttf" (size: 16, spacing: 0)

examples/styles/style_turbo.h

@@ -30,7 +30,7 @@ static const GuiStyleProp turboStyleProps[TURBO_STYLE_PROPS_COUNT] = {
     { 0, 16, (int)0x00000010 },    // DEFAULT_TEXT_SIZE 
     { 0, 18, (int)0xbbaf6cff },    // DEFAULT_LINE_COLOR 
     { 0, 19, (int)0x60645fff },    // DEFAULT_BACKGROUND_COLOR 
-    { 0, 20, (int)0x00000018 },    // DEFAULT_TEXT_LINE_SPACING 
+    { 0, 20, (int)0x00000008 },    // DEFAULT_TEXT_LINE_SPACING 
     { 1, 8, (int)0xf0e4c4ff },    // LABEL_TEXT_COLOR_PRESSED
     { 1, 11, (int)0x959680ff },    // LABEL_TEXT_COLOR_DISABLED
     { 4, 8, (int)0xb4aa8dff },    // SLIDER_TEXT_COLOR_PRESSED

examples/styles/style_wisteria.h

@@ -31,7 +31,7 @@ static const GuiStyleProp wisteriaStyleProps[WISTERIA_STYLE_PROPS_COUNT] = {
     { 0, 17, (int)0x00000000 },    // DEFAULT_TEXT_SPACING 
     { 0, 18, (int)0x9b74d2ff },    // DEFAULT_LINE_COLOR 
     { 0, 19, (int)0xe9eaf6ff },    // DEFAULT_BACKGROUND_COLOR 
-    { 0, 20, (int)0x00000012 },    // DEFAULT_TEXT_LINE_SPACING 
+    { 0, 20, (int)0x00000008 },    // DEFAULT_TEXT_LINE_SPACING 
     { 4, 3, (int)0xa9bdcfff },    // SLIDER_BORDER_COLOR_FOCUSED
     { 4, 5, (int)0xacc4d8ff },    // SLIDER_TEXT_COLOR_FOCUSED
     { 5, 3, (int)0xb5c7d9ff },    // PROGRESSBAR_BORDER_COLOR_FOCUSED

src/raygui.h

@@ -4449,11 +4449,11 @@ int GuiTextInputBox(Rectangle bounds, const char *title, const char *message, ch
     Rectangle textBounds = { 0 };
     if (message != NULL)
     {
-        int textSize = GuiGetTextWidth(message) + 2;
+        int messageTextSize = GuiGetTextWidth(message) + 2;
 
-        textBounds.x = bounds.x + bounds.width/2 - textSize/2;
+        textBounds.x = bounds.x + bounds.width/2 - messageTextSize/2;
         textBounds.y = bounds.y + RAYGUI_WINDOWBOX_STATUSBAR_HEIGHT + messageInputHeight/4 - (float)GuiGetStyle(DEFAULT, TEXT_SIZE)/2;
-        textBounds.width = (float)textSize;
+        textBounds.width = (float)messageTextSize;
         textBounds.height = (float)GuiGetStyle(DEFAULT, TEXT_SIZE);
     }
 
@@ -4641,8 +4641,8 @@ void GuiLoadStyle(const char *fileName)
                 {
                     case 'v':
                     {
-                        sscanf(buffer, "v %d", &version);
+                        sscanf(buffer, "v %u", &version);
-                    }
+                    } break;
                     case 'p':
                     {
                         // Style property: p <control_id> <property_id> <property_value> <property_name>

styles/advance/style_advance.h

@@ -11,7 +11,7 @@
 //                                                                              //
 //////////////////////////////////////////////////////////////////////////////////
 
-#define ADVANCE_STYLE_PROPS_COUNT  25
+#define ADVANCE_STYLE_PROPS_COUNT  26
 
 // Custom style name: Advance
 static const GuiStyleProp advanceStyleProps[ADVANCE_STYLE_PROPS_COUNT] = {
@@ -31,6 +31,7 @@ static const GuiStyleProp advanceStyleProps[ADVANCE_STYLE_PROPS_COUNT] = {
     { 0, 17, (int)0x00000000 },    // DEFAULT_TEXT_SPACING 
     { 0, 18, (int)0x9eadd0ff },    // DEFAULT_LINE_COLOR 
     { 0, 19, (int)0xe6e6e6ff },    // DEFAULT_BACKGROUND_COLOR 
+    { 0, 20, (int)0x00000006 },    // DEFAULT_TEXT_LINE_SPACING 
     { 1, 5, (int)0x917de2ff },    // LABEL_TEXT_COLOR_FOCUSED
     { 1, 8, (int)0xffb033ff },    // LABEL_TEXT_COLOR_PRESSED
     { 4, 5, (int)0xb0b0e1ff },    // SLIDER_TEXT_COLOR_FOCUSED

styles/advance/style_advance.rgs.txt

@@ -25,6 +25,7 @@ p 00 16 0x0000000c    TEXT_SIZE
 p 00 17 0x00000000    TEXT_SPACING 
 p 00 18 0x9eadd0ff    LINE_COLOR 
 p 00 19 0xe6e6e6ff    BACKGROUND_COLOR 
+p 00 20 0x00000006    TEXT_LINE_SPACING 
 p 01 05 0x917de2ff    LABEL_TEXT_COLOR_FOCUSED 
 p 01 08 0xffb033ff    LABEL_TEXT_COLOR_PRESSED 
 p 04 05 0xb0b0e1ff    SLIDER_TEXT_COLOR_FOCUSED 

styles/brick/style_brick.h

@@ -11,7 +11,7 @@
 //                                                                              //
 //////////////////////////////////////////////////////////////////////////////////
 
-#define BRICK_STYLE_PROPS_COUNT  17
+#define BRICK_STYLE_PROPS_COUNT  18
 
 // Custom style name: Brick
 static const GuiStyleProp brickStyleProps[BRICK_STYLE_PROPS_COUNT] = {
@@ -29,6 +29,7 @@ static const GuiStyleProp brickStyleProps[BRICK_STYLE_PROPS_COUNT] = {
     { 0, 11, (int)0x8c9c9eff },    // DEFAULT_TEXT_COLOR_DISABLED
     { 0, 18, (int)0x71a8aeff },    // DEFAULT_LINE_COLOR 
     { 0, 19, (int)0xeff0f3ff },    // DEFAULT_BACKGROUND_COLOR 
+    { 0, 20, (int)0x00000008 },    // DEFAULT_TEXT_LINE_SPACING 
     { 1, 5, (int)0x568a90ff },    // LABEL_TEXT_COLOR_FOCUSED
     { 9, 5, (int)0x5e9095ff },    // TEXTBOX_TEXT_COLOR_FOCUSED
     { 10, 5, (int)0x639196ff },    // VALUEBOX_TEXT_COLOR_FOCUSED

styles/brick/style_brick.rgs.txt

@@ -23,6 +23,7 @@ p 00 10 0xc8d7d9ff    DEFAULT_BASE_COLOR_DISABLED
 p 00 11 0x8c9c9eff    DEFAULT_TEXT_COLOR_DISABLED 
 p 00 18 0x71a8aeff    LINE_COLOR 
 p 00 19 0xeff0f3ff    BACKGROUND_COLOR 
+p 00 20 0x00000008    TEXT_LINE_SPACING 
 p 01 05 0x568a90ff    LABEL_TEXT_COLOR_FOCUSED 
 p 09 05 0x5e9095ff    TEXTBOX_TEXT_COLOR_FOCUSED 
 p 10 05 0x639196ff    VALUEBOX_TEXT_COLOR_FOCUSED 

styles/pocket/style_pocket.h

@@ -31,7 +31,7 @@ static const GuiStyleProp pocketStyleProps[POCKET_STYLE_PROPS_COUNT] = {
     { 0, 17, (int)0x00000000 },    // DEFAULT_TEXT_SPACING 
     { 0, 18, (int)0x56591eff },    // DEFAULT_LINE_COLOR 
     { 0, 19, (int)0xd9d9ceff },    // DEFAULT_BACKGROUND_COLOR 
-    { 0, 20, (int)0x00000018 },    // DEFAULT_TEXT_LINE_SPACING 
+    { 0, 20, (int)0x00000008 },    // DEFAULT_TEXT_LINE_SPACING 
 };
 
 // WARNING: This style uses a custom font: "GMSN.ttf" (size: 16, spacing: 0)

styles/pocket/style_pocket.rgs.txt

@@ -25,4 +25,4 @@ p 00 16 0x00000010    TEXT_SIZE
 p 00 17 0x00000000    TEXT_SPACING 
 p 00 18 0x56591eff    LINE_COLOR 
 p 00 19 0xd9d9ceff    BACKGROUND_COLOR 
-p 00 20 0x00000018    TEXT_LINE_SPACING 
+p 00 20 0x00000008    TEXT_LINE_SPACING 

styles/turbo/style_turbo.h

@@ -30,7 +30,7 @@ static const GuiStyleProp turboStyleProps[TURBO_STYLE_PROPS_COUNT] = {
     { 0, 16, (int)0x00000010 },    // DEFAULT_TEXT_SIZE 
     { 0, 18, (int)0xbbaf6cff },    // DEFAULT_LINE_COLOR 
     { 0, 19, (int)0x60645fff },    // DEFAULT_BACKGROUND_COLOR 
-    { 0, 20, (int)0x00000018 },    // DEFAULT_TEXT_LINE_SPACING 
+    { 0, 20, (int)0x00000008 },    // DEFAULT_TEXT_LINE_SPACING 
     { 1, 8, (int)0xf0e4c4ff },    // LABEL_TEXT_COLOR_PRESSED
     { 1, 11, (int)0x959680ff },    // LABEL_TEXT_COLOR_DISABLED
     { 4, 8, (int)0xb4aa8dff },    // SLIDER_TEXT_COLOR_PRESSED

styles/turbo/style_turbo.rgs.txt

@@ -24,7 +24,7 @@ p 00 11 0x696a5dff    DEFAULT_TEXT_COLOR_DISABLED
 p 00 16 0x00000010    TEXT_SIZE 
 p 00 18 0xbbaf6cff    LINE_COLOR 
 p 00 19 0x60645fff    BACKGROUND_COLOR 
-p 00 20 0x00000018    TEXT_LINE_SPACING 
+p 00 20 0x00000008    TEXT_LINE_SPACING 
 p 01 08 0xf0e4c4ff    LABEL_TEXT_COLOR_PRESSED 
 p 01 11 0x959680ff    LABEL_TEXT_COLOR_DISABLED 
 p 04 08 0xb4aa8dff    SLIDER_TEXT_COLOR_PRESSED 

styles/wisteria/style_wisteria.h

@@ -31,7 +31,7 @@ static const GuiStyleProp wisteriaStyleProps[WISTERIA_STYLE_PROPS_COUNT] = {
     { 0, 17, (int)0x00000000 },    // DEFAULT_TEXT_SPACING 
     { 0, 18, (int)0x9b74d2ff },    // DEFAULT_LINE_COLOR 
     { 0, 19, (int)0xe9eaf6ff },    // DEFAULT_BACKGROUND_COLOR 
-    { 0, 20, (int)0x00000012 },    // DEFAULT_TEXT_LINE_SPACING 
+    { 0, 20, (int)0x00000008 },    // DEFAULT_TEXT_LINE_SPACING 
     { 4, 3, (int)0xa9bdcfff },    // SLIDER_BORDER_COLOR_FOCUSED
     { 4, 5, (int)0xacc4d8ff },    // SLIDER_TEXT_COLOR_FOCUSED
     { 5, 3, (int)0xb5c7d9ff },    // PROGRESSBAR_BORDER_COLOR_FOCUSED

styles/wisteria/style_wisteria.rgs.txt

@@ -25,7 +25,7 @@ p 00 16 0x0000000c    TEXT_SIZE
 p 00 17 0x00000000    TEXT_SPACING 
 p 00 18 0x9b74d2ff    LINE_COLOR 
 p 00 19 0xe9eaf6ff    BACKGROUND_COLOR 
-p 00 20 0x00000012    TEXT_LINE_SPACING 
+p 00 20 0x00000008    TEXT_LINE_SPACING 
 p 04 03 0xa9bdcfff    SLIDER_BORDER_COLOR_FOCUSED 
 p 04 05 0xacc4d8ff    SLIDER_TEXT_COLOR_FOCUSED 
 p 05 03 0xb5c7d9ff    PROGRESSBAR_BORDER_COLOR_FOCUSED