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

Some code review

Browse Source
This commit is contained in:
Ray
2018-05-06 01:17:31 +02:00
parent fe756d71e2
commit f2f7f4b5c5
2 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/rGuiLayout/layouts/image_exporter.rgl
View File

@ -13,11 +13,11 @@ a 004 0 0 0
a 005 0 0 0 a 005 0 0 0
a 006 0 0 0 a 006 0 0 0
a 007 0 0 0 a 007 0 0 0
c 000 0 exportWindow 0 0 240 190 1 Image Export Options c 000 0 exportWindow 0 0 220 190 1 Image Export Options
c 001 4 lblFileFormat 10 35 60 25 1 File format: c 001 4 lblFileFormat 10 35 60 25 1 File format:
c 002 9 fileFormat 80 35 150 25 1 Laser/Shoot c 002 9 fileFormat 80 35 130 25 1 Laser/Shoot
c 003 4 lblPixelFormat 10 70 63 25 1 Pixel format: c 003 4 lblPixelFormat 10 70 63 25 1 Pixel format:
c 004 9 pixelFormat 80 70 150 25 1 SAMPLE TEXT c 004 9 pixelFormat 80 70 130 25 1 SAMPLE TEXT
c 005 4 lblFileName 10 105 50 25 1 File name: c 005 4 lblFileName 10 105 50 25 1 File name:
c 006 13 fileName 80 105 150 25 1 Untitled c 006 13 fileName 80 105 130 25 1 Untitled
c 007 5 ExportImage 10 145 220 30 1 Export Image c 007 5 ExportImage 10 145 200 30 1 Export Image

36
tools/rGuiLayout/rguilayout.c
View File

@ -135,7 +135,7 @@ int main()
// Initialization // Initialization
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
SetConfigFlags(FLAG_WINDOW_RESIZABLE); SetConfigFlags(FLAG_WINDOW_RESIZABLE);
InitWindow(screenWidth, screenHeight, "rGuiLayout v1.0 - not_saved_layout"); InitWindow(screenWidth, screenHeight, "rGuiLayout v1.0");
SetExitKey(0); SetExitKey(0);
// General app variables // General app variables
@ -272,8 +272,10 @@ int main()
char prevControlText[32]; char prevControlText[32];
char prevControlName[32]; char prevControlName[32];
char loadedFileName[128] = "not_loaded_layout";
// Close layout window variables // Close layout window variables
bool ultimateMessage = false; bool closingWindowActive = false;
// Generate code options window variables // Generate code options window variables
Vector2 exportWindowPos = { 50, 50 }; Vector2 exportWindowPos = { 50, 50 };
@ -318,7 +320,7 @@ int main()
if (generateWindowActive) generateWindowActive = false; if (generateWindowActive) generateWindowActive = false;
else else
{ {
ultimateMessage = !ultimateMessage; closingWindowActive = !closingWindowActive;
selectedControl = -1; selectedControl = -1;
controlLockMode = false; controlLockMode = false;
} }
@ -401,7 +403,7 @@ int main()
} }
// Create new control // Create new control
if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON) && (selectedControl == -1) && !anchorMode && !tracemapEditMode && !ultimateMessage && !paletteMode && !generateWindowActive) if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON) && (selectedControl == -1) && !anchorMode && !tracemapEditMode && !closingWindowActive && !paletteMode && !generateWindowActive)
{ {
// Add new control (button) // Add new control (button)
layout.controls[layout.controlsCount].id = layout.controlsCount; layout.controls[layout.controlsCount].id = layout.controlsCount;
@ -476,9 +478,8 @@ int main()
} }
} }
if (!(controlDrag || controlLockMode || tracemapEditMode || anchorLockMode || ultimateMessage || paletteMode || generateWindowActive)) if (!(controlDrag || controlLockMode || tracemapEditMode || anchorLockMode || closingWindowActive || paletteMode || generateWindowActive))
{ {
// Check selected control (on mouse hover) // Check selected control (on mouse hover)
for (int i = layout.controlsCount; i >= 0; i--) for (int i = layout.controlsCount; i >= 0; i--)
{ {
@ -522,11 +523,9 @@ int main()
if (controlDrag && !controlLockMode) if (controlDrag && !controlLockMode)
{ {
layout.controls[selectedControl].rec.x = prevControlPosition.x + (mouse.x - panControlOffset.x); layout.controls[selectedControl].rec.x = prevControlPosition.x + (mouse.x - panControlOffset.x);
layout.controls[selectedControl].rec.y = prevControlPosition.y + (mouse.y - panControlOffset.y); layout.controls[selectedControl].rec.y = prevControlPosition.y + (mouse.y - panControlOffset.y);
// Snap to grid position and size // Snap to grid position and size
if (snapMode) if (snapMode)
{ {
@ -1053,7 +1052,12 @@ int main()
droppedFiles = GetDroppedFiles(&fileCount); droppedFiles = GetDroppedFiles(&fileCount);
strcpy(droppedFileName, droppedFiles[0]); strcpy(droppedFileName, droppedFiles[0]);
if (IsFileExtension(droppedFileName, ".rgl")) LoadLayoutRGL(droppedFileName); if (IsFileExtension(droppedFileName, ".rgl"))
{
LoadLayoutRGL(droppedFileName);
strcpy(loadedFileName, droppedFileName);
SetWindowTitle(FormatText("rGuiLayout v1.0 - %s", GetFileName(loadedFileName)));
}
else if (IsFileExtension(droppedFileName, ".rgs")) GuiLoadStyle(droppedFileName); else if (IsFileExtension(droppedFileName, ".rgs")) GuiLoadStyle(droppedFileName);
else if (IsFileExtension(droppedFileName, ".png")) else if (IsFileExtension(droppedFileName, ".png"))
{ {
@ -1099,7 +1103,7 @@ int main()
} }
// Activate code generation export window // Activate code generation export window
if (IsKeyDown(KEY_LEFT_CONTROL) && IsKeyPressed(KEY_ENTER) && !ultimateMessage) generateWindowActive = true; if (IsKeyDown(KEY_LEFT_CONTROL) && IsKeyPressed(KEY_ENTER) && !closingWindowActive) generateWindowActive = true;
if (generateWindowActive) // Keep window in the middle of screen if (generateWindowActive) // Keep window in the middle of screen
{ {
@ -1276,7 +1280,7 @@ int main()
} }
// Draws the defaultRec[selectedType] of the control selected // Draws the defaultRec[selectedType] of the control selected
if (selectedControl == -1 && !anchorMode && !tracemapEditMode && !ultimateMessage && !paletteMode && !generateWindowActive) if (selectedControl == -1 && !anchorMode && !tracemapEditMode && !closingWindowActive && !paletteMode && !generateWindowActive)
{ {
switch (selectedTypeDraw) switch (selectedTypeDraw)
{ {
@ -1540,10 +1544,10 @@ int main()
else GuiStatusBar((Rectangle){ 348, GetScreenHeight() - 24, GetScreenWidth() - 348, 24}, "", 15); else GuiStatusBar((Rectangle){ 348, GetScreenHeight() - 24, GetScreenWidth() - 348, 24}, "", 15);
// Draw ending message window (save) // Draw ending message window (save)
if (ultimateMessage) if (closingWindowActive)
{ {
DrawRectangle(0, 0, GetScreenWidth(), GetScreenHeight(), Fade(WHITE, 0.7f)); DrawRectangle(0, 0, GetScreenWidth(), GetScreenHeight(), Fade(WHITE, 0.7f));
ultimateMessage = !GuiWindowBox((Rectangle){ GetScreenWidth()/2 - 125, GetScreenHeight()/2 - 50, 250, 100 }, "Closing rGuiLayout"); closingWindowActive = !GuiWindowBox((Rectangle){ GetScreenWidth()/2 - 125, GetScreenHeight()/2 - 50, 250, 100 }, "Closing rGuiLayout");
GuiLabel((Rectangle){ GetScreenWidth()/2 - 95, GetScreenHeight()/2 - 60, 200, 100 }, "Do you want to save before quitting?"); GuiLabel((Rectangle){ GetScreenWidth()/2 - 95, GetScreenHeight()/2 - 60, 200, 100 }, "Do you want to save before quitting?");
@ -2055,10 +2059,10 @@ static void GenerateCodeFromRGL(const char *fileName)
config.width = 800; config.width = 800;
config.height = 600; config.height = 600;
strcpy(config.name, "file_name"); strcpy(config.name, "layout_file_name");
strcpy(config.version, "1.0-dev"); strcpy(config.version, "1.0-dev");
strcpy(config.company, "raylib tech"); strcpy(config.company, "raylib technologies");
strcpy(config.description, "tool description sample"); strcpy(config.description, "tool description");
config.defineRecs = false; config.defineRecs = false;
config.exportAnchors = true; config.exportAnchors = true;
config.exportAnchor0 = false; config.exportAnchor0 = false;