Merge pull request #17 from ChrisDill/patch-1

Only run dropdown collision check if dropdown open
This commit is contained in:
Ray
2018-09-26 15:57:44 +02:00
committed by GitHub

View File

@ -1616,6 +1616,7 @@ RAYGUIDEF int GuiDropdownBox(Rectangle bounds, const char **text, int count, int
GuiControlState state = guiState; GuiControlState state = guiState;
bool dropActive = false; bool dropActive = false;
static bool dropOpen = false;
static bool clicked = false; static bool clicked = false;
int textWidth = MeasureText(text[active], style[DEFAULT_TEXT_SIZE]); int textWidth = MeasureText(text[active], style[DEFAULT_TEXT_SIZE]);
@ -1642,6 +1643,7 @@ RAYGUIDEF int GuiDropdownBox(Rectangle bounds, const char **text, int count, int
{ {
bounds.height *= (count + 1); bounds.height *= (count + 1);
dropActive = true; dropActive = true;
dropOpen = true;
} }
if (CheckCollisionPointRec(mousePoint, bounds)) if (CheckCollisionPointRec(mousePoint, bounds))
@ -1651,7 +1653,7 @@ RAYGUIDEF int GuiDropdownBox(Rectangle bounds, const char **text, int count, int
} }
else state = NORMAL; else state = NORMAL;
if (IsMouseButtonReleased(MOUSE_LEFT_BUTTON)) if (IsMouseButtonReleased(MOUSE_LEFT_BUTTON) && dropOpen)
{ {
for (int i = 1; i < (count + 1); i++) for (int i = 1; i < (count + 1); i++)
{ {