twix/raygui
1
0
Fork 0
mirror of https://github.com/raysan5/raygui.git synced 2026-01-31 11:19:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed colorPicker disable error

Browse Source
This commit is contained in:
Ray
2018-05-15 14:03:06 +02:00
parent c7d6bc3516
commit 7011747348
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/rGuiStyler/src/rguistyler.c
View File

@ -574,8 +574,6 @@ int main(int argc, char *argv[])
GuiTextBox(bounds[TEXTBOX], guiText, spinnerValue, editFilenameText); GuiTextBox(bounds[TEXTBOX], guiText, spinnerValue, editFilenameText);
colorPickerValue = GuiColorPicker(bounds[COLORPICKER], colorPickerValue);
// Draw labels for GuiColorPicker information (RGBA) // Draw labels for GuiColorPicker information (RGBA)
GuiGroupBox((Rectangle){ anchor02.x + 290, anchor02.y + 285, 64, 75 }, "RGBA"); GuiGroupBox((Rectangle){ anchor02.x + 290, anchor02.y + 285, 64, 75 }, "RGBA");
GuiLabel((Rectangle){ anchor02.x + 300 + 3, anchor02.y + 295 - 2, 20, 20 }, FormatText("R: %03i", colorPickerValue.r)); GuiLabel((Rectangle){ anchor02.x + 300 + 3, anchor02.y + 295 - 2, 20, 20 }, FormatText("R: %03i", colorPickerValue.r));
@ -595,6 +593,8 @@ int main(int argc, char *argv[])
DrawRectangleLinesEx((Rectangle){ anchor02.x + 292, anchor02.y + 440, 60, 80 }, 2, GetColor(style[DEFAULT_BORDER_COLOR_NORMAL])); DrawRectangleLinesEx((Rectangle){ anchor02.x + 292, anchor02.y + 440, 60, 80 }, 2, GetColor(style[DEFAULT_BORDER_COLOR_NORMAL]));
GuiEnable(); GuiEnable();
colorPickerValue = GuiColorPicker(bounds[COLORPICKER], colorPickerValue);
// Draw save style button // Draw save style button
if (GuiButton(bounds[BUTTON], "Save Style")) BtnSaveStyle(guiText, comboActive); if (GuiButton(bounds[BUTTON], "Save Style")) BtnSaveStyle(guiText, comboActive);
@ -715,6 +715,8 @@ static Color ColorBox(Rectangle bounds, Color *colorPicker, Color color)
// Save raygui style file (.rgs), text or binary // Save raygui style file (.rgs), text or binary
static void SaveStyleRGS(const char *fileName, bool binary) static void SaveStyleRGS(const char *fileName, bool binary)
{ {
#define NUM_COLOR_PROPERTIES 130
if (binary) if (binary)
{ {
#define RGS_FILE_VERSION_BINARY 200 #define RGS_FILE_VERSION_BINARY 200
@ -733,7 +735,7 @@ static void SaveStyleRGS(const char *fileName, bool binary)
char signature[5] = "RGS "; char signature[5] = "RGS ";
short version = RGS_FILE_VERSION_BINARY; short version = RGS_FILE_VERSION_BINARY;
short reserved = 0; short reserved = 0;
short numProperties = NUM_PROPERTIES; short numProperties = NUM_COLOR_PROPERTIES;
short changedProperties = 0; short changedProperties = 0;
for (int i = 0; i < NUM_PROPERTIES; i++) if (styleBackup[i] != style[i]) changedProperties++; for (int i = 0; i < NUM_PROPERTIES; i++) if (styleBackup[i] != style[i]) changedProperties++;
@ -773,7 +775,7 @@ static void SaveStyleRGS(const char *fileName, bool binary)
// Write some description comments // Write some description comments
fprintf(rgsFile, "#\n# rgst file (v%s) - raygui style text file generated using rGuiStyler\n#\n", RGS_FILE_VERSION_TEXT); fprintf(rgsFile, "#\n# rgst file (v%s) - raygui style text file generated using rGuiStyler\n#\n", RGS_FILE_VERSION_TEXT);
fprintf(rgsFile, "# Total number of properties: %i\n", NUM_PROPERTIES); fprintf(rgsFile, "# Total number of properties: %i\n", NUM_COLOR_PROPERTIES);
fprintf(rgsFile, "# Number of properties changed: %i\n", counter); fprintf(rgsFile, "# Number of properties changed: %i\n", counter);
fprintf(rgsFile, "# Required base default style: %s\n#\n", "LIGHT"); // TODO: check base style fprintf(rgsFile, "# Required base default style: %s\n#\n", "LIGHT"); // TODO: check base style