Reviewed windows active/deactive

This commit is contained in:
Ray
2018-05-04 23:54:41 +02:00
parent 69cc3aa4c0
commit fe756d71e2

View File

@ -315,9 +315,13 @@ int main()
// Show save layout message window on ESC // Show save layout message window on ESC
if (IsKeyPressed(KEY_ESCAPE) && !textEditMode && !nameEditMode) if (IsKeyPressed(KEY_ESCAPE) && !textEditMode && !nameEditMode)
{ {
ultimateMessage = !ultimateMessage; if (generateWindowActive) generateWindowActive = false;
selectedControl = -1; else
controlLockMode = false; {
ultimateMessage = !ultimateMessage;
selectedControl = -1;
controlLockMode = false;
}
} }
// Enables or disables snapMode if not in textEditMode // Enables or disables snapMode if not in textEditMode
@ -1095,7 +1099,7 @@ int main()
} }
// Activate code generation export window // Activate code generation export window
if (IsKeyDown(KEY_LEFT_CONTROL) && IsKeyPressed(KEY_ENTER)) generateWindowActive = true; if (IsKeyDown(KEY_LEFT_CONTROL) && IsKeyPressed(KEY_ENTER) && !ultimateMessage) generateWindowActive = true;
if (generateWindowActive) // Keep window in the middle of screen if (generateWindowActive) // Keep window in the middle of screen
{ {
@ -1417,8 +1421,8 @@ int main()
// Draw Rectangle Info // Draw Rectangle Info
if (selectedControl != -1) if (selectedControl != -1)
{ {
if (!controlGlobalPos) DrawText(FormatText("[%i, %i, %i, %i]", layout.controls[selectedControl].rec.x, layout.controls[selectedControl].rec.y, layout.controls[selectedControl].rec.width, layout.controls[selectedControl].rec.height), layout.controls[selectedControl].rec.x + layout.controls[selectedControl].ap->x, layout.controls[selectedControl].rec.y + layout.controls[selectedControl].ap->y - 30, 20, MAROON); if (!controlGlobalPos) DrawText(FormatText("[%i, %i, %i, %i]", (int)layout.controls[selectedControl].rec.x, (int)layout.controls[selectedControl].rec.y, (int)layout.controls[selectedControl].rec.width, (int)layout.controls[selectedControl].rec.height), (int)layout.controls[selectedControl].rec.x + layout.controls[selectedControl].ap->x, (int)layout.controls[selectedControl].rec.y + layout.controls[selectedControl].ap->y - 30, 20, MAROON);
else DrawText(FormatText("[%i, %i, %i, %i]", layout.controls[selectedControl].rec.x + layout.controls[selectedControl].ap->x, layout.controls[selectedControl].rec.y + layout.controls[selectedControl].ap->y, layout.controls[selectedControl].rec.width, layout.controls[selectedControl].rec.height), layout.controls[selectedControl].rec.x + layout.controls[selectedControl].ap->x, layout.controls[selectedControl].rec.y + layout.controls[selectedControl].ap->y - 30, 20, RED); else DrawText(FormatText("[%i, %i, %i, %i]", (int)layout.controls[selectedControl].rec.x + layout.controls[selectedControl].ap->x, (int)layout.controls[selectedControl].rec.y + layout.controls[selectedControl].ap->y, (int)layout.controls[selectedControl].rec.width, (int)layout.controls[selectedControl].rec.height), (int)layout.controls[selectedControl].rec.x + layout.controls[selectedControl].ap->x, (int)layout.controls[selectedControl].rec.y + layout.controls[selectedControl].ap->y - 30, 20, RED);
} }
// Draw Image info // Draw Image info