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

rGuiLayout: changed help and palette panels

Browse Source 
- Now it works as a toggle, with IsKeyPressed()
This commit is contained in:
Ray
2018-05-22 12:12:38 +02:00
parent 8b877df5d5
commit 93e33ba541
1 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
tools/rGuiLayout/src/rguilayout.c
View File

@ -1,6 +1,6 @@
/******************************************************************************************* /*******************************************************************************************
* *
* rGuiLayout v1.0 - raygui layout editor * rGuiLayout v1.1 - raygui layout editor
* *
* Compile this program using: * Compile this program using:
* gcc -o rguilayout.exe rguilayout.c external/tinyfiledialogs.c -I..\.. \ * gcc -o rguilayout.exe rguilayout.c external/tinyfiledialogs.c -I..\.. \
@ -202,6 +202,7 @@ int main()
int helpCounter = 0; int helpCounter = 0;
int helpStartPositionX = -300; int helpStartPositionX = -300;
int helpDeltaPositionX = 0; int helpDeltaPositionX = 0;
bool helpActive = false;
// Rectangles used on controls preview drawing // Rectangles used on controls preview drawing
Rectangle defaultRec[21] = { Rectangle defaultRec[21] = {
@ -369,24 +370,26 @@ int main()
if (IsKeyPressed(KEY_F) && (!textEditMode) && (!nameEditMode)) controlGlobalPos = !controlGlobalPos; if (IsKeyPressed(KEY_F) && (!textEditMode) && (!nameEditMode)) controlGlobalPos = !controlGlobalPos;
// Toggle help info // Toggle help info
if (IsKeyPressed(KEY_TAB)) if (IsKeyPressed(KEY_TAB) && !helpActive)
{ {
helpStartPositionX = helpPositionX; helpStartPositionX = helpPositionX;
helpDeltaPositionX = 0 - helpStartPositionX; helpDeltaPositionX = 0 - helpStartPositionX;
helpCounter = 0; helpCounter = 0;
helpActive = true;
} }
else if (IsKeyPressed(KEY_TAB) && helpActive)
if (IsKeyDown(KEY_TAB))
{
helpCounter++;
if (helpCounter >= 60) helpCounter = 60;
helpPositionX = (int)EaseCubicInOut(helpCounter, helpStartPositionX, helpDeltaPositionX, 60);
}
else if (IsKeyReleased(KEY_TAB))
{ {
helpStartPositionX = helpPositionX; helpStartPositionX = helpPositionX;
helpDeltaPositionX = -300 - helpStartPositionX; helpDeltaPositionX = -300 - helpStartPositionX;
helpCounter = 0; helpCounter = 0;
helpActive = false;
}
if (helpActive)
{
helpCounter++;
if (helpCounter >= 60) helpCounter = 60;
helpPositionX = (int)EaseCubicInOut(helpCounter, helpStartPositionX, helpDeltaPositionX, 60);
} }
else else
{ {
@ -396,10 +399,22 @@ int main()
} }
// Controls palette selector logic // Controls palette selector logic
if ((IsMouseButtonDown(MOUSE_RIGHT_BUTTON)) && (!anchorMode)) if ((IsMouseButtonPressed(MOUSE_RIGHT_BUTTON)) && (!anchorMode) && (!paletteMode))
{ {
paletteMode = true; paletteMode = true;
paletteEasingOut = 0; paletteEasingOut = 0;
}
else if ((IsMouseButtonPressed(MOUSE_RIGHT_BUTTON)) && (!anchorMode) && (paletteMode))
{
paletteMode = false;
paletteEasingIn = 0;
}
if (paletteMode)
{
paletteEasingIn++;
if (paletteEasingIn >= PALETTE_EASING_FRAMES) paletteEasingIn = PALETTE_EASING_FRAMES;
palettePanel.x = (int)EaseCubicInOut(paletteEasingIn, paletteStartPosX,(GetScreenWidth() - 145) - paletteStartPosX, PALETTE_EASING_FRAMES);
for (int i = 0; i < 21; i++) for (int i = 0; i < 21; i++)
{ {
@ -413,18 +428,6 @@ int main()
} }
} }
else else
{
paletteMode = false;
paletteEasingIn = 0;
}
if (paletteMode)
{
paletteEasingIn++;
if (paletteEasingIn >= PALETTE_EASING_FRAMES) paletteEasingIn = PALETTE_EASING_FRAMES;
palettePanel.x = (int)EaseCubicInOut(paletteEasingIn, paletteStartPosX,(GetScreenWidth() - 145) - paletteStartPosX, PALETTE_EASING_FRAMES);
}
else
{ {
paletteStartPosX = GetScreenWidth() + 130; paletteStartPosX = GetScreenWidth() + 130;
paletteEasingOut++; paletteEasingOut++;