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

Updated GuiGrid()

Browse Source 
Now returns current selected cell
This commit is contained in:
Ray
2018-10-03 00:07:47 +02:00
parent f567e34d58
commit 6e207931a1
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/raygui.h
View File

@ -3039,31 +3039,24 @@ RAYGUIDEF bool GuiMessageBox(Rectangle bounds, const char *windowTitle, const ch
} }
// Grid control // Grid control
// NOTE: Returns mouse position on grid // NOTE: Returns mouse position on grid, selected cell
RAYGUIDEF Vector2 GuiGrid(Rectangle bounds, int spacing, int subdivs, bool snap) RAYGUIDEF Vector2 GuiGrid(Rectangle bounds, int spacing, int subdivs)
{ {
#define GRID_COLOR_ALPHA 0.15f // Grid lines alpha amount #define GRID_COLOR_ALPHA 0.15f // Grid lines alpha amount
GuiControlState state = guiState; GuiControlState state = guiState;
Vector2 mousePoint = GetMousePosition(); Vector2 mousePoint = GetMousePosition();
Vector2 currentCell = { -1, -1 };
// Update control // Update control
//-------------------------------------------------------------------- //--------------------------------------------------------------------
if (state != DISABLED) if (state != DISABLED)
{ {
// Check mouse position if snap // Check mouse position if snap
if (CheckCollisionPointRec(mousePoint, bounds) && snap) if (CheckCollisionPointRec(mousePoint, bounds))
{ {
// Mouse snap to grid points currentCell.x = (int)((mousePoint.x - bounds.x)/spacing);
// NOTE: Point changes when spacing/2 has been surpassed in X and Y currentCell.y = (int)((mousePoint.y - bounds.y)/spacing);
int offsetX = (int)mousePoint.x%spacing;
int offsetY = (int)mousePoint.y%spacing;
if (offsetX >= spacing/2) mousePoint.x += (spacing - offsetX);
else mousePoint.x -= offsetX;
if (offsetY >= spacing/2) mousePoint.y += (spacing - offsetY);
else mousePoint.y -= offsetY;
} }
} }
//-------------------------------------------------------------------- //--------------------------------------------------------------------
@ -3090,7 +3083,7 @@ RAYGUIDEF Vector2 GuiGrid(Rectangle bounds, int spacing, int subdivs, bool snap)
default: break; default: break;
} }
return mousePoint; return currentCell;
} }
#if defined(RAYGUI_STYLE_SAVE_LOAD) #if defined(RAYGUI_STYLE_SAVE_LOAD)