twix/raygui
1
0
Fork 0
mirror of https://github.com/raysan5/raygui.git synced 2025-12-25 10:22:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Some code reviews

Browse Source
This commit is contained in:
Ray
2018-04-12 20:15:09 +02:00
parent 21adbc3c1d
commit 9c9f4e0413
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/raygui.h
View File

@ -2692,10 +2692,9 @@ RAYGUIDEF void GuiLoadStyle(const char *fileName)
{ {
char signature[5] = ""; char signature[5] = "";
short version = 0; short version = 0;
short reserved = 0;
short numProperties = 0; short numProperties = 0;
short changedProperties = 0; short changedProperties = 0;
short reserved = 0;
int editionTime = 0;
fread(signature, 1, 4, rgsFile); fread(signature, 1, 4, rgsFile);
fread(&version, 1, sizeof(short), rgsFile); fread(&version, 1, sizeof(short), rgsFile);

18
tools/rGuiLayout/rguilayout.c
View File

@ -139,8 +139,7 @@ int main()
bool anchorNewPos = false; bool anchorNewPos = false;
bool lockAnchorMode = false; bool lockAnchorMode = false;
int saveAnchorSelected = -1; int saveAnchorSelected = -1;
GuiControl aux;
int snapFrameCounter = 0; int snapFrameCounter = 0;
bool lockMode = false; bool lockMode = false;
@ -342,31 +341,28 @@ int main()
layout.controlsCount++; layout.controlsCount++;
} }
// TODO: Change controls layer order (position inside array) // Change controls layer order (position inside array)
if (IsKeyDown(KEY_LEFT_ALT) && !lockMode) if (IsKeyDown(KEY_LEFT_ALT) && !lockMode)
{ {
if ((IsKeyPressed(KEY_UP)) && (selectedControl < layout.controlsCount - 1)) if ((IsKeyPressed(KEY_UP)) && (selectedControl < layout.controlsCount - 1))
{ {
// Move control towards beginning of array // Move control towards beginning of array
// selectedControl pos --> selectedControl - 1 pos (if possible) GuiControl auxControl = layout.controls[selectedControl];
//GuiControl prevControl = layout.controls[selectedControl - 1];
//for (int i = selectedControl - 1; i < layout.controlsCount - 1; i++) layout.controls[i] = layout.controls[i + 1];
aux = layout.controls[selectedControl];
layout.controls[selectedControl] = layout.controls[selectedControl + 1]; layout.controls[selectedControl] = layout.controls[selectedControl + 1];
layout.controls[selectedControl + 1] = aux; layout.controls[selectedControl + 1] = auxControl;
} }
else if ((IsKeyPressed(KEY_DOWN)) && (selectedControl > 0)) else if ((IsKeyPressed(KEY_DOWN)) && (selectedControl > 0))
{ {
// Move control towards end of array // Move control towards end of array
aux = layout.controls[selectedControl]; GuiControl auxControl = layout.controls[selectedControl];
layout.controls[selectedControl] = layout.controls[selectedControl - 1]; layout.controls[selectedControl] = layout.controls[selectedControl - 1];
layout.controls[selectedControl - 1] = aux; layout.controls[selectedControl - 1] = auxControl;
} }
} }
if (!(controlDrag || lockMode || tracemapEditMode || lockAnchorMode)) if (!(controlDrag || lockMode || tracemapEditMode || lockAnchorMode))
{ {
// Check selected control (on mouse over) // Check selected control (on mouse hover)
for (int i = 0; i < layout.controlsCount; i++) for (int i = 0; i < layout.controlsCount; i++)
{ {
if (controlDrag || lockMode || tracemapEditMode || lockAnchorMode) break; if (controlDrag || lockMode || tracemapEditMode || lockAnchorMode) break;