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

Fixed ColorPicker bounds collision

Browse Source 
- Mouse can't get out of colorPicker bounds when pressing
- Mouse hides so user can see better the selector
This commit is contained in:
Ray
2018-05-16 13:07:37 +02:00
parent d2553a1403
commit fb6c441626
1 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tools/rGuiStyler/src/rguistyler.c
View File

@ -397,7 +397,11 @@ int main(int argc, char *argv[])
bool checked = false; bool checked = false;
bool selectingColor = false;
int spinnerValue = 28; int spinnerValue = 28;
Vector2 mousePos = { 0 };
int comboNum = 2; int comboNum = 2;
const char *comboText[2] = { "Style Text (.rgs)", "Style Binary (.rgs)" }; const char *comboText[2] = { "Style Text (.rgs)", "Style Binary (.rgs)" };
@ -431,6 +435,9 @@ int main(int argc, char *argv[])
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
framesCounter++; framesCounter++;
// Get mouse position each frame
mousePos = GetMousePosition();
// Check for changed controls // Check for changed controls
if ((framesCounter%120) == 0) if ((framesCounter%120) == 0)
{ {
@ -494,6 +501,28 @@ int main(int argc, char *argv[])
colorHSV = ColorToHSV(colorPickerValue); colorHSV = ColorToHSV(colorPickerValue);
if (CheckCollisionPointRec(mousePos, bounds[COLORPICKER]))
{
if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) selectingColor = true;
}
if (IsMouseButtonReleased(MOUSE_LEFT_BUTTON))
{
selectingColor = false;
ShowCursor();
}
if (selectingColor)
{
HideCursor();
if (mousePos.x < bounds[COLORPICKER].x) SetMousePosition((Vector2){ bounds[COLORPICKER].x, mousePos.y });
else if (mousePos.x > bounds[COLORPICKER].x + bounds[COLORPICKER].width) SetMousePosition((Vector2){ bounds[COLORPICKER].x + bounds[COLORPICKER].width, mousePos.y });
if (mousePos.y < bounds[COLORPICKER].y) SetMousePosition((Vector2){ mousePos.x, bounds[COLORPICKER].y });
else if (mousePos.y > bounds[COLORPICKER].y + bounds[COLORPICKER].height) SetMousePosition((Vector2){ mousePos.x, bounds[COLORPICKER].y + bounds[COLORPICKER].height });
}
// Control TextBox edit mode // Control TextBox edit mode
if (CheckCollisionPointRec(GetMousePosition(), bounds[TEXTBOX]) && (IsKeyPressed(KEY_ENTER) || IsMouseButtonPressed(MOUSE_LEFT_BUTTON))) editFilenameText = !editFilenameText; if (CheckCollisionPointRec(GetMousePosition(), bounds[TEXTBOX]) && (IsKeyPressed(KEY_ENTER) || IsMouseButtonPressed(MOUSE_LEFT_BUTTON))) editFilenameText = !editFilenameText;
if (CheckCollisionPointRec(GetMousePosition(), (Rectangle){ anchor02.x + 290, anchor02.y + 530, 65, 20 }) && (IsKeyPressed(KEY_ENTER) || IsMouseButtonPressed(MOUSE_LEFT_BUTTON))) editHexColorText = !editHexColorText; if (CheckCollisionPointRec(GetMousePosition(), (Rectangle){ anchor02.x + 290, anchor02.y + 530, 65, 20 }) && (IsKeyPressed(KEY_ENTER) || IsMouseButtonPressed(MOUSE_LEFT_BUTTON))) editHexColorText = !editHexColorText;