From 7e6f3db4a6ac978e1f24302704b64d459ccb7c55 Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 6 Nov 2017 00:15:29 +0100 Subject: [PATCH] Updated default light style Corrected some style bugs --- src/raygui.h | 176 +++++++++++++-------------- tools/rGuiStyler/rguistyler.c | 2 +- tools/rGuiStyler/rguistyler_REV1.png | Bin 67811 -> 67823 bytes 3 files changed, 89 insertions(+), 89 deletions(-) diff --git a/src/raygui.h b/src/raygui.h index 795c3ae..eb19002 100644 --- a/src/raygui.h +++ b/src/raygui.h @@ -405,86 +405,86 @@ static int styleGeneric[20] = { static int style[NUM_PROPERTIES] = { 0x686868ff, // LABEL_TEXT_COLOR_NORMAL -----> DEFAULT_TEXT_COLOR_NORMAL 0x6c9bbcff, // LABEL_TEXT_COLOR_FOCUSED ----> DEFAULT_TEXT_COLOR_FOCUSED - 0x0480b5ff, // LABEL_TEXT_COLOR_PRESSED ----> DEFAULT_TEXT_COLOR_PRESSED - 2, // BUTTON_BORDER_WIDTH ----> DEFAULT_BORDER_WIDTH - 0x000000ff, // BUTTON_BORDER_COLOR_NORMAL ----> DEFAULT_BORDER_COLOR_NORMAL - 0x000000ff, // BUTTON_BASE_COLOR_NORMAL ----> DEFAULT_BASE_COLOR_NORMAL - 0x000000ff, // BUTTON_TEXT_COLOR_NORMAL ----> DEFAULT_TEXT_COLOR_NORMAL - 0x000000ff, // BUTTON_BORDER_COLOR_FOCUSED ----> DEFAULT_BORDER_COLOR_FOCUSED - 0x000000ff, // BUTTON_BASE_COLOR_FOCUSED ----> DEFAULT_BASE_COLOR_FOCUSED - 0x000000ff, // BUTTON_TEXT_COLOR_FOCUSED ----> DEFAULT_TEXT_COLOR_FOCUSED - 0x000000ff, // BUTTON_BORDER_COLOR_PRESSED ----> DEFAULT_BORDER_COLOR_PRESSED - 0x000000ff, // BUTTON_BASE_COLOR_PRESSED ----> DEFAULT_BASE_COLOR_PRESSED - 0x000000ff, // BUTTON_TEXT_COLOR_PRESSED ----> DEFAULT_TEXT_COLOR_PRESSED - 0x000000ff, // TOGGLE_BORDER_WIDTH ----> DEFAULT_BORDER_WIDTH - 0x000000ff, // TOGGLE_BORDER_COLOR_NORMAL ----> DEFAULT_BORDER_COLOR_NORMAL - 0x000000ff, // TOGGLE_BASE_COLOR_NORMAL ----> DEFAULT_BASE_COLOR_NORMAL - 0x000000ff, // TOGGLE_TEXT_COLOR_NORMAL ----> DEFAULT_TEXT_COLOR_NORMAL - 0x000000ff, // TOGGLE_BORDER_COLOR_FOCUSED ----> DEFAULT_BORDER_COLOR_FOCUSED - 0x000000ff, // TOGGLE_BASE_COLOR_FOCUSED ----> DEFAULT_BASE_COLOR_FOCUSED - 0x000000ff, // TOGGLE_TEXT_COLOR_FOCUSED ----> DEFAULT_TEXT_COLOR_FOCUSED - 0x000000ff, // TOGGLE_BORDER_COLOR_PRESSED ----> DEFAULT_BORDER_COLOR_PRESSED - 0x000000ff, // TOGGLE_BASE_COLOR_PRESSED ----> DEFAULT_BASE_COLOR_PRESSED - 0x000000ff, // TOGGLE_TEXT_COLOR_PRESSED ----> DEFAULT_TEXT_COLOR_PRESSED - 2, // TOGGLEGROUP_PADDING - 0x000000ff, // SLIDER_BORDER_WIDTH ----> DEFAULT_BORDER_WIDTH - 0x000000ff, // SLIDER_BORDER_COLOR_NORMAL ----> DEFAULT_BORDER_COLOR_NORMAL - 0x000000ff, // SLIDER_BASE_COLOR_NORMAL ----> DEFAULT_BASE_COLOR_NORMAL - 0x000000ff, // SLIDER_BORDER_COLOR_FOCUSED ----> DEFAULT_BORDER_COLOR_FOCUSED - 0x000000ff, // SLIDER_BASE_COLOR_FOCUSED ----> DEFAULT_BASE_COLOR_FOCUSED - 0x000000ff, // SLIDER_BORDER_COLOR_PRESSED ----> DEFAULT_BORDER_COLOR_PRESSED - 0x000000ff, // SLIDER_BASE_COLOR_PRESSED ----> DEFAULT_BASE_COLOR_PRESSED - 0x000000ff, // SLIDERBAR_BORDER_WIDTH ----> DEFAULT_BORDER_WIDTH - 0x000000ff, // SLIDERBAR_BORDER_COLOR_NORMAL ----> DEFAULT_BORDER_COLOR_NORMAL - 0x000000ff, // SLIDERBAR_BASE_COLOR_NORMAL ----> DEFAULT_BASE_COLOR_NORMAL - 0x000000ff, // SLIDERBAR_BORDER_COLOR_FOCUSED ----> DEFAULT_BORDER_COLOR_FOCUSED - 0x000000ff, // SLIDERBAR_BASE_COLOR_FOCUSED ----> DEFAULT_BASE_COLOR_FOCUSED - 0x000000ff, // SLIDERBAR_BORDER_COLOR_PRESSED ----> DEFAULT_BORDER_COLOR_PRESSED - 0x000000ff, // SLIDERBAR_BASE_COLOR_PRESSED ----> DEFAULT_BASE_COLOR_PRESSED - 0x000000ff, // PROGRESSBAR_BORDER_WIDTH ----> DEFAULT_BORDER_WIDTH - 0x000000ff, // PROGRESSBAR_BORDER_COLOR_NORMAL ----> DEFAULT_BORDER_COLOR_NORMAL - 0x000000ff, // PROGRESSBAR_BASE_COLOR_NORMAL ----> DEFAULT_BASE_COLOR_FOCUSED - 0x000000ff, // PROGRESSBAR_BORDER_COLOR_FOCUSED ----> DEFAULT_BORDER_COLOR_FOCUSED - 0x000000ff, // PROGRESSBAR_BASE_COLOR_FOCUSED ----> DEFAULT_BASE_COLOR_PRESSED - 2, // SPINNER_BUTTON_PADDING - 0x000000ff, // SPINNER_BORDER_COLOR_NORMAL ----> DEFAULT_BORDER_COLOR_NORMAL - 0x000000ff, // SPINNER_BASE_COLOR_NORMAL ----> DEFAULT_BASE_COLOR_NORMAL - 0x000000ff, // SPINNER_TEXT_COLOR_NORMAL ----> DEFAULT_TEXT_COLOR_NORMAL - 0x000000ff, // SPINNER_BORDER_COLOR_FOCUSED ----> DEFAULT_BORDER_COLOR_FOCUSED - 0x000000ff, // SPINNER_BASE_COLOR_FOCUSED ----> DEFAULT_BASE_COLOR_FOCUSED - 0x000000ff, // SPINNER_TEXT_COLOR_FOCUSED ----> DEFAULT_TEXT_COLOR_FOCUSED - 0x000000ff, // SPINNER_BORDER_COLOR_PRESSED ----> DEFAULT_BORDER_COLOR_PRESSED - 0x000000ff, // SPINNER_BASE_COLOR_PRESSED ----> DEFAULT_BASE_COLOR_PRESSED - 0x000000ff, // SPINNER_TEXT_COLOR_PRESSED ----> DEFAULT_TEXT_COLOR_PRESSED - 0x000000ff, // COMBOBOX_BORDER_WIDTH ----> DEFAULT_BORDER_WIDTH - 2, // COMBOBOX_BUTTON_PADDING - 0x000000ff, // COMBOBOX_BORDER_COLOR_NORMAL ----> DEFAULT_BORDER_COLOR_NORMAL - 0x000000ff, // COMBOBOX_BASE_COLOR_NORMAL ----> DEFAULT_BASE_COLOR_NORMAL - 0x000000ff, // COMBOBOX_TEXT_COLOR_NORMAL ----> DEFAULT_TEXT_COLOR_NORMAL - 0x000000ff, // COMBOBOX_BORDER_COLOR_FOCUSED ----> DEFAULT_BORDER_COLOR_FOCUSED - 0x000000ff, // COMBOBOX_BASE_COLOR_FOCUSED ----> DEFAULT_BASE_COLOR_FOCUSED - 0x000000ff, // COMBOBOX_TEXT_COLOR_FOCUSED ----> DEFAULT_TEXT_COLOR_FOCUSED - 0x000000ff, // COMBOBOX_BORDER_COLOR_PRESSED ----> DEFAULT_BORDER_COLOR_PRESSED - 0x000000ff, // COMBOBOX_BASE_COLOR_PRESSED ----> DEFAULT_BASE_COLOR_PRESSED - 0x000000ff, // COMBOBOX_TEXT_COLOR_PRESSED ----> DEFAULT_TEXT_COLOR_PRESSED - 0x000000ff, // CHECKBOX_BORDER_WIDTH ----> DEFAULT_BORDER_WIDTH - 1, // CHECKBOX_INNER_PADDING - 0x000000ff, // CHECKBOX_BORDER_COLOR_NORMAL ----> DEFAULT_BORDER_COLOR_NORMAL - 0x000000ff, // CHECKBOX_BASE_COLOR_NORMAL ----> DEFAULT_BACKGROUND_COLOR - 0x000000ff, // CHECKBOX_BORDER_COLOR_FOCUSED ----> DEFAULT_BORDER_COLOR_FOCUSED - 0x000000ff, // CHECKBOX_BASE_COLOR_FOCUSED ----> DEFAULT_TEXT_COLOR_FOCUSED - 0x000000ff, // CHECKBOX_BORDER_COLOR_PRESSED ----> DEFAULT_BORDER_COLOR_PRESSED - 0x000000ff, // CHECKBOX_BASE_COLOR_PRESSED ----> DEFAULT_TEXT_COLOR_PRESSED - 0x000000ff, // TEXTBOX_BORDER_WIDTH ----> DEFAULT_BORDER_WIDTH - 0x000000ff, // TEXTBOX_BORDER_COLOR_NORMAL ----> DEFAULT_BORDER_COLOR_NORMAL - 0x000000ff, // TEXTBOX_BASE_COLOR_NORMAL ----> DEFAULT_BACKGROUND_COLOR - 0x000000ff, // TEXTBOX_TEXT_COLOR_NORMAL ----> DEFAULT_TEXT_COLOR_NORMAL - 0x000000ff, // TEXTBOX_BORDER_COLOR_FOCUSED ----> DEFAULT_BORDER_COLOR_FOCUSED - 0x000000ff, // TEXTBOX_BASE_COLOR_FOCUSED ----> DEFAULT_BASE_COLOR_FOCUSED - 0x000000ff, // TEXTBOX_TEXT_COLOR_FOCUSED ----> DEFAULT_TEXT_COLOR_FOCUSED - 0x000000ff, // TEXTBOX_BORDER_COLOR_PRESSED ----> DEFAULT_BORDER_COLOR_PRESSED - 0x000000ff, // TEXTBOX_BASE_COLOR_PRESSED ----> DEFAULT_BASE_COLOR_PRESSED - 0x000000ff, // TEXTBOX_TEXT_COLOR_PRESSED ----> DEFAULT_TEXT_COLOR_PRESSED + 0x480b5ff, // LABEL_TEXT_COLOR_PRESSED ----> DEFAULT_TEXT_COLOR_PRESSED + 0x2, // BUTTON_BORDER_WIDTH ----> DEFAULT_BORDER_WIDTH + 0x828282ff, // BUTTON_BORDER_COLOR_NORMAL ----> DEFAULT_BORDER_COLOR_NORMAL + 0xc8c8c8ff, // BUTTON_BASE_COLOR_NORMAL ----> DEFAULT_BASE_COLOR_NORMAL + 0x686868ff, // BUTTON_TEXT_COLOR_NORMAL ----> DEFAULT_TEXT_COLOR_NORMAL + 0x7bb0d6ff, // BUTTON_BORDER_COLOR_FOCUSED ----> DEFAULT_BORDER_COLOR_FOCUSED + 0xc9effeff, // BUTTON_BASE_COLOR_FOCUSED ----> DEFAULT_BASE_COLOR_FOCUSED + 0x6c9bbcff, // BUTTON_TEXT_COLOR_FOCUSED ----> DEFAULT_TEXT_COLOR_FOCUSED + 0x48cc7ff, // BUTTON_BORDER_COLOR_PRESSED ----> DEFAULT_BORDER_COLOR_PRESSED + 0x97e8ffff, // BUTTON_BASE_COLOR_PRESSED ----> DEFAULT_BASE_COLOR_PRESSED + 0x480b5ff, // BUTTON_TEXT_COLOR_PRESSED ----> DEFAULT_TEXT_COLOR_PRESSED + 0x1, // TOGGLE_BORDER_WIDTH ----> DEFAULT_BORDER_WIDTH + 0x828282ff, // TOGGLE_BORDER_COLOR_NORMAL ----> DEFAULT_BORDER_COLOR_NORMAL + 0xc8c8c8ff, // TOGGLE_BASE_COLOR_NORMAL ----> DEFAULT_BASE_COLOR_NORMAL + 0x686868ff, // TOGGLE_TEXT_COLOR_NORMAL ----> DEFAULT_TEXT_COLOR_NORMAL + 0x7bb0d6ff, // TOGGLE_BORDER_COLOR_FOCUSED ----> DEFAULT_BORDER_COLOR_FOCUSED + 0xc9effeff, // TOGGLE_BASE_COLOR_FOCUSED ----> DEFAULT_BASE_COLOR_FOCUSED + 0x6c9bbcff, // TOGGLE_TEXT_COLOR_FOCUSED ----> DEFAULT_TEXT_COLOR_FOCUSED + 0x48cc7ff, // TOGGLE_BORDER_COLOR_PRESSED ----> DEFAULT_BORDER_COLOR_PRESSED + 0x97e8ffff, // TOGGLE_BASE_COLOR_PRESSED ----> DEFAULT_BASE_COLOR_PRESSED + 0x480b5ff, // TOGGLE_TEXT_COLOR_PRESSED ----> DEFAULT_TEXT_COLOR_PRESSED + 0x2, // TOGGLEGROUP_PADDING + 0x1, // SLIDER_BORDER_WIDTH ----> DEFAULT_BORDER_WIDTH + 0x828282ff, // SLIDER_BORDER_COLOR_NORMAL ----> DEFAULT_BORDER_COLOR_NORMAL + 0xc8c8c8ff, // SLIDER_BASE_COLOR_NORMAL ----> DEFAULT_BASE_COLOR_NORMAL + 0x7bb0d6ff, // SLIDER_BORDER_COLOR_FOCUSED ----> DEFAULT_BORDER_COLOR_FOCUSED + 0xc9effeff, // SLIDER_BASE_COLOR_FOCUSED ----> DEFAULT_BASE_COLOR_FOCUSED + 0x48cc7ff, // SLIDER_BORDER_COLOR_PRESSED ----> DEFAULT_BORDER_COLOR_PRESSED + 0x97e8ffff, // SLIDER_BASE_COLOR_PRESSED ----> DEFAULT_BASE_COLOR_PRESSED + 0x1, // SLIDERBAR_BORDER_WIDTH ----> DEFAULT_BORDER_WIDTH + 0x828282ff, // SLIDERBAR_BORDER_COLOR_NORMAL ----> DEFAULT_BORDER_COLOR_NORMAL + 0xc8c8c8ff, // SLIDERBAR_BASE_COLOR_NORMAL ----> DEFAULT_BASE_COLOR_NORMAL + 0x7bb0d6ff, // SLIDERBAR_BORDER_COLOR_FOCUSED ----> DEFAULT_BORDER_COLOR_FOCUSED + 0xc9effeff, // SLIDERBAR_BASE_COLOR_FOCUSED ----> DEFAULT_BASE_COLOR_FOCUSED + 0x48cc7ff, // SLIDERBAR_BORDER_COLOR_PRESSED ----> DEFAULT_BORDER_COLOR_PRESSED + 0x97e8ffff, // SLIDERBAR_BASE_COLOR_PRESSED ----> DEFAULT_BASE_COLOR_PRESSED + 0x1, // PROGRESSBAR_BORDER_WIDTH ----> DEFAULT_BORDER_WIDTH + 0x828282ff, // PROGRESSBAR_BORDER_COLOR_NORMAL ----> DEFAULT_BORDER_COLOR_NORMAL + 0xc9effeff, // PROGRESSBAR_BASE_COLOR_NORMAL ----> DEFAULT_BASE_COLOR_FOCUSED + 0x7bb0d6ff, // PROGRESSBAR_BORDER_COLOR_FOCUSED ----> DEFAULT_BORDER_COLOR_FOCUSED + 0x97e8ffff, // PROGRESSBAR_BASE_COLOR_FOCUSED ----> DEFAULT_BASE_COLOR_PRESSED + 0x2, // SPINNER_BUTTON_PADDING + 0x828282ff, // SPINNER_BORDER_COLOR_NORMAL ----> DEFAULT_BORDER_COLOR_NORMAL + 0xc8c8c8ff, // SPINNER_BASE_COLOR_NORMAL ----> DEFAULT_BASE_COLOR_NORMAL + 0x686868ff, // SPINNER_TEXT_COLOR_NORMAL ----> DEFAULT_TEXT_COLOR_NORMAL + 0x7bb0d6ff, // SPINNER_BORDER_COLOR_FOCUSED ----> DEFAULT_BORDER_COLOR_FOCUSED + 0xc9effeff, // SPINNER_BASE_COLOR_FOCUSED ----> DEFAULT_BASE_COLOR_FOCUSED + 0x6c9bbcff, // SPINNER_TEXT_COLOR_FOCUSED ----> DEFAULT_TEXT_COLOR_FOCUSED + 0x48cc7ff, // SPINNER_BORDER_COLOR_PRESSED ----> DEFAULT_BORDER_COLOR_PRESSED + 0x97e8ffff, // SPINNER_BASE_COLOR_PRESSED ----> DEFAULT_BASE_COLOR_PRESSED + 0x480b5ff, // SPINNER_TEXT_COLOR_PRESSED ----> DEFAULT_TEXT_COLOR_PRESSED + 0x1, // COMBOBOX_BORDER_WIDTH ----> DEFAULT_BORDER_WIDTH + 0x2, // COMBOBOX_BUTTON_PADDING + 0x828282ff, // COMBOBOX_BORDER_COLOR_NORMAL ----> DEFAULT_BORDER_COLOR_NORMAL + 0xc8c8c8ff, // COMBOBOX_BASE_COLOR_NORMAL ----> DEFAULT_BASE_COLOR_NORMAL + 0x686868ff, // COMBOBOX_TEXT_COLOR_NORMAL ----> DEFAULT_TEXT_COLOR_NORMAL + 0x7bb0d6ff, // COMBOBOX_BORDER_COLOR_FOCUSED ----> DEFAULT_BORDER_COLOR_FOCUSED + 0xc9effeff, // COMBOBOX_BASE_COLOR_FOCUSED ----> DEFAULT_BASE_COLOR_FOCUSED + 0x6c9bbcff, // COMBOBOX_TEXT_COLOR_FOCUSED ----> DEFAULT_TEXT_COLOR_FOCUSED + 0x48cc7ff, // COMBOBOX_BORDER_COLOR_PRESSED ----> DEFAULT_BORDER_COLOR_PRESSED + 0x97e8ffff, // COMBOBOX_BASE_COLOR_PRESSED ----> DEFAULT_BASE_COLOR_PRESSED + 0x480b5ff, // COMBOBOX_TEXT_COLOR_PRESSED ----> DEFAULT_TEXT_COLOR_PRESSED + 0x1, // CHECKBOX_BORDER_WIDTH ----> DEFAULT_BORDER_WIDTH + 0x1, // CHECKBOX_INNER_PADDING + 0x828282ff, // CHECKBOX_BORDER_COLOR_NORMAL ----> DEFAULT_BORDER_COLOR_NORMAL + 0xf5f5f5ff, // CHECKBOX_BASE_COLOR_NORMAL ----> DEFAULT_BACKGROUND_COLOR + 0x7bb0d6ff, // CHECKBOX_BORDER_COLOR_FOCUSED ----> DEFAULT_BORDER_COLOR_FOCUSED + 0x6c9bbcff, // CHECKBOX_BASE_COLOR_FOCUSED ----> DEFAULT_TEXT_COLOR_FOCUSED + 0x48cc7ff, // CHECKBOX_BORDER_COLOR_PRESSED ----> DEFAULT_BORDER_COLOR_PRESSED + 0x480b5ff, // CHECKBOX_BASE_COLOR_PRESSED ----> DEFAULT_TEXT_COLOR_PRESSED + 0x1, // TEXTBOX_BORDER_WIDTH ----> DEFAULT_BORDER_WIDTH + 0x828282ff, // TEXTBOX_BORDER_COLOR_NORMAL ----> DEFAULT_BORDER_COLOR_NORMAL + 0xf5f5f5ff, // TEXTBOX_BASE_COLOR_NORMAL ----> DEFAULT_BACKGROUND_COLOR + 0x686868ff, // TEXTBOX_TEXT_COLOR_NORMAL ----> DEFAULT_TEXT_COLOR_NORMAL + 0x7bb0d6ff, // TEXTBOX_BORDER_COLOR_FOCUSED ----> DEFAULT_BORDER_COLOR_FOCUSED + 0xc9effeff, // TEXTBOX_BASE_COLOR_FOCUSED ----> DEFAULT_BASE_COLOR_FOCUSED + 0x6c9bbcff, // TEXTBOX_TEXT_COLOR_FOCUSED ----> DEFAULT_TEXT_COLOR_FOCUSED + 0x48cc7ff, // TEXTBOX_BORDER_COLOR_PRESSED ----> DEFAULT_BORDER_COLOR_PRESSED + 0x97e8ffff, // TEXTBOX_BASE_COLOR_PRESSED ----> DEFAULT_BASE_COLOR_PRESSED + 0x480b5ff, // TEXTBOX_TEXT_COLOR_PRESSED ----> DEFAULT_TEXT_COLOR_PRESSED }; //---------------------------------------------------------------------------------- @@ -882,19 +882,19 @@ RAYGUIDEF float GuiSlider(Rectangle bounds, float value, float minValue, float m case NORMAL: { DrawRectangleRecT(bounds, GetColor(style[SLIDER_BORDER_COLOR_NORMAL])); - DrawRectangleT(bounds.x + style[SLIDER_BORDER_WIDTH], bounds.y + style[SLIDER_BORDER_WIDTH], bounds.width - 2*style[SLIDER_BORDER_WIDTH], bounds.height - 2*style[SLIDER_BORDER_WIDTH], GetColor(DEFAULT_BACKGROUND_COLOR)); + DrawRectangleT(bounds.x + style[SLIDER_BORDER_WIDTH], bounds.y + style[SLIDER_BORDER_WIDTH], bounds.width - 2*style[SLIDER_BORDER_WIDTH], bounds.height - 2*style[SLIDER_BORDER_WIDTH], GetColor(styleGeneric[DEFAULT_BACKGROUND_COLOR])); DrawRectangleRecT(slider, GetColor(style[SLIDER_BASE_COLOR_NORMAL])); } break; case FOCUSED: { DrawRectangleRecT(bounds, GetColor(style[SLIDER_BORDER_COLOR_FOCUSED])); - DrawRectangleT(bounds.x + style[SLIDER_BORDER_WIDTH], bounds.y + style[SLIDER_BORDER_WIDTH], bounds.width - 2*style[SLIDER_BORDER_WIDTH], bounds.height - 2*style[SLIDER_BORDER_WIDTH], GetColor(DEFAULT_BACKGROUND_COLOR)); + DrawRectangleT(bounds.x + style[SLIDER_BORDER_WIDTH], bounds.y + style[SLIDER_BORDER_WIDTH], bounds.width - 2*style[SLIDER_BORDER_WIDTH], bounds.height - 2*style[SLIDER_BORDER_WIDTH], GetColor(styleGeneric[DEFAULT_BACKGROUND_COLOR])); DrawRectangleRecT(slider, GetColor(style[SLIDER_BASE_COLOR_FOCUSED])); } break; case PRESSED: { DrawRectangleRecT(bounds, GetColor(style[SLIDER_BORDER_COLOR_PRESSED])); - DrawRectangleT(bounds.x + style[SLIDER_BORDER_WIDTH], bounds.y + style[SLIDER_BORDER_WIDTH], bounds.width - 2*style[SLIDER_BORDER_WIDTH], bounds.height - 2*style[SLIDER_BORDER_WIDTH], GetColor(DEFAULT_BACKGROUND_COLOR)); + DrawRectangleT(bounds.x + style[SLIDER_BORDER_WIDTH], bounds.y + style[SLIDER_BORDER_WIDTH], bounds.width - 2*style[SLIDER_BORDER_WIDTH], bounds.height - 2*style[SLIDER_BORDER_WIDTH], GetColor(styleGeneric[DEFAULT_BACKGROUND_COLOR])); DrawRectangleRecT(slider, GetColor(style[SLIDER_BASE_COLOR_PRESSED])); } break; default: break; @@ -995,13 +995,13 @@ RAYGUIDEF float GuiProgressBar(Rectangle bounds, float value, float minValue, fl case NORMAL: { DrawRectangleRecT(bounds, GetColor(style[PROGRESSBAR_BORDER_COLOR_NORMAL])); - DrawRectangleT(bounds.x + style[PROGRESSBAR_BORDER_WIDTH], bounds.y + style[PROGRESSBAR_BORDER_WIDTH], bounds.width - 2*style[PROGRESSBAR_BORDER_WIDTH], bounds.height - 2*style[PROGRESSBAR_BORDER_WIDTH], GetColor(DEFAULT_BACKGROUND_COLOR)); + DrawRectangleT(bounds.x + style[PROGRESSBAR_BORDER_WIDTH], bounds.y + style[PROGRESSBAR_BORDER_WIDTH], bounds.width - 2*style[PROGRESSBAR_BORDER_WIDTH], bounds.height - 2*style[PROGRESSBAR_BORDER_WIDTH], GetColor(styleGeneric[DEFAULT_BACKGROUND_COLOR])); DrawRectangleRecT(progress, GetColor(style[PROGRESSBAR_BASE_COLOR_NORMAL])); } break; case FOCUSED: { DrawRectangleRecT(bounds, GetColor(style[SLIDERBAR_BORDER_COLOR_FOCUSED])); - DrawRectangleT(bounds.x + style[SLIDERBAR_BORDER_WIDTH], bounds.y + style[SLIDERBAR_BORDER_WIDTH], bounds.width - 2*style[SLIDERBAR_BORDER_WIDTH], bounds.height - 2*style[SLIDERBAR_BORDER_WIDTH], GetColor(DEFAULT_BACKGROUND_COLOR)); + DrawRectangleT(bounds.x + style[SLIDERBAR_BORDER_WIDTH], bounds.y + style[SLIDERBAR_BORDER_WIDTH], bounds.width - 2*style[SLIDERBAR_BORDER_WIDTH], bounds.height - 2*style[SLIDERBAR_BORDER_WIDTH], GetColor(styleGeneric[DEFAULT_BACKGROUND_COLOR])); DrawRectangleRecT(progress, GetColor(style[PROGRESSBAR_BASE_COLOR_FOCUSED])); } break; case PRESSED: break; @@ -1603,13 +1603,13 @@ RAYGUIDEF void UpdateStyleComplete(void) // Save current GUI style into a text file RAYGUIDEF void SaveGuiStyle(const char *fileName) { - /* FILE *styleFile = fopen(fileName, "wt"); - for (int i = 0; i < NUM_PROPERTIES; i++) fprintf(styleFile, "%-40s0x%x\n", guiPropertyName[i], GetStyleProperty(i)); + //for (int i = 0; i < NUM_PROPERTIES; i++) fprintf(styleFile, "%-40s0x%x\n", guiPropertyName[i], GetStyleProperty(i)); + for (int i = 0; i < NUM_PROPERTIES; i++) fprintf(styleFile, "0x%x\n", GetStyleProperty(i)); + fclose(styleFile); - */ } // Load GUI style from a text file diff --git a/tools/rGuiStyler/rguistyler.c b/tools/rGuiStyler/rguistyler.c index 6afe9f0..b9edf3b 100644 --- a/tools/rGuiStyler/rguistyler.c +++ b/tools/rGuiStyler/rguistyler.c @@ -240,7 +240,7 @@ int main() currentPath[strlen(currentPath)] = '\\'; currentPath[strlen(currentPath) + 1] = '\0'; // Not really required - LoadGuiStyleImage("rguistyle_default_dark.png"); + //LoadGuiStyleImage("rguistyle_default_dark.png"); SetTargetFPS(60); //-------------------------------------------------------------------------------------- diff --git a/tools/rGuiStyler/rguistyler_REV1.png b/tools/rGuiStyler/rguistyler_REV1.png index 70307cc83135c23165a5c95774b4a6f83a767086..0a5df1d7abec3c946c7af5af784db8949cc1a4f7 100644 GIT binary patch delta 10965 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 Pz<&V?7x~nBGc*4OOdsDg