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

Corrected some crash conditions...

Browse Source 
Some parts require some redesign...
This commit is contained in:
raysan5
2016-09-13 20:10:02 +02:00
parent 0ecb0cee40
commit 47dc4455e2
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tools/rGuiStyler/rguistyler.c
View File

@ -211,7 +211,6 @@ int main()
for (int i = 0; i < NUM_COLOR_SAMPLES; i++) colorSample[i] = RAYWHITE; for (int i = 0; i < NUM_COLOR_SAMPLES; i++) colorSample[i] = RAYWHITE;
int sampleDelta = 18;
int rgbWidthLabel = 30; int rgbWidthLabel = 30;
int rgbHeightLabel = 20; int rgbHeightLabel = 20;
int rgbDelta = 6; int rgbDelta = 6;
@ -348,8 +347,7 @@ int main()
else if (guiPropertyType[guiPropertyHover] == 1) sizeValueSelected = GetStyleProperty(guiPropertyHover); else if (guiPropertyType[guiPropertyHover] == 1) sizeValueSelected = GetStyleProperty(guiPropertyHover);
} }
// TODO: REVIEW: Can make the application crash... // TODO: REVIEW: Corrected crash due to -1 values... redesign required... --> BE CAREFUL!
/*
if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON))
{ {
if (guiPropertySelected == i) guiPropertySelected = -1; if (guiPropertySelected == i) guiPropertySelected = -1;
@ -357,18 +355,18 @@ int main()
{ {
guiPropertySelected = i; guiPropertySelected = i;
if (guiPropertyType[guiPropertyHover] == 0) if ((guiPropertyHover > -1) && (guiPropertyType[guiPropertyHover] == 0))
{ {
colorPickerValue = GetColor(GetStyleProperty(guiPropertySelected)); if (guiPropertySelected > -1) colorPickerValue = GetColor(GetStyleProperty(guiPropertySelected));
redValue = colorPickerValue.r; redValue = colorPickerValue.r;
greenValue = colorPickerValue.g; greenValue = colorPickerValue.g;
blueValue = colorPickerValue.b; blueValue = colorPickerValue.b;
} }
else sizeValueSelected = GetStyleProperty(guiPropertySelected); else if (guiPropertySelected > -1) sizeValueSelected = GetStyleProperty(guiPropertySelected);
} }
} }
*/
break; break;
} }
else guiPropertyHover = -1; else guiPropertyHover = -1;
@ -452,15 +450,14 @@ int main()
} }
} }
// Update style color value --> PROGRAM CRASH!!! // Update style color value --> BE CAREFUL...
/*
if (guiPropertySelected == BACKGROUND_COLOR) bgColor = colorPickerValue; if (guiPropertySelected == BACKGROUND_COLOR) bgColor = colorPickerValue;
else if ((guiPropertySelected != BACKGROUND_COLOR) && (guiPropertyType[guiPropertySelected] == 0)) else if ((guiPropertySelected >= 0) && (guiPropertyType[guiPropertySelected] == 0))
{ {
bgColor = GetColor(GetStyleProperty(BACKGROUND_COLOR)); bgColor = GetColor(GetStyleProperty(BACKGROUND_COLOR));
SetStyleProperty(guiPropertySelected, GetHexValue(colorPickerValue)); SetStyleProperty(guiPropertySelected, GetHexValue(colorPickerValue));
} }
*/
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
// Draw // Draw