3party/raygui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

REVIEWED: Narrowing issue with styles #179

Browse Source 
Actually this issue is a bit tricky, C++ (g++ only) complains about narrowing on styles if `propertyValue` is assigned an hexadecimal value because it was not `unsigned int`, making it unsigned it avoids that error but then properties can only be positive... maybe we need some property value to be negative?

Maybe this issue will require further review in the future.
This commit is contained in:
Ray 2022-06-01 20:48:20 +02:00
parent 4232b2a0e7
commit df117f84cb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/raygui.h
View File

@ -315,7 +315,7 @@
typedef struct GuiStyleProp { typedef struct GuiStyleProp {
unsigned short controlId; unsigned short controlId;
unsigned short propertyId; unsigned short propertyId;
int propertyValue; unsigned int propertyValue;
} GuiStyleProp; } GuiStyleProp;
// Gui control state // Gui control state
@ -3355,13 +3355,13 @@ void GuiLoadStyle(const char *fileName)
{ {
short controlId = 0; short controlId = 0;
short propertyId = 0; short propertyId = 0;
int propertyValue = 0; unsigned int propertyValue = 0;
for (int i = 0; i < propertyCount; i++) for (int i = 0; i < propertyCount; i++)
{ {
fread(&controlId, 1, sizeof(short), rgsFile); fread(&controlId, 1, sizeof(short), rgsFile);
fread(&propertyId, 1, sizeof(short), rgsFile); fread(&propertyId, 1, sizeof(short), rgsFile);
fread(&propertyValue, 1, sizeof(int), rgsFile); fread(&propertyValue, 1, sizeof(unsigned int), rgsFile);
if (controlId == 0) // DEFAULT control if (controlId == 0) // DEFAULT control
{ {