|
|
@@ -2927,7 +2927,7 @@ int GuiProgressBar(Rectangle bounds, const char *textLeft, const char *textRight
|
|
|
{
|
|
|
if (*value > minValue)
|
|
|
{
|
|
|
- // Border color aligned with progress bar, more visual
|
|
|
+ // Draw progress bar with colored border, more visual
|
|
|
GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ bounds.x, bounds.y, (int)progress.width + (float)GuiGetStyle(PROGRESSBAR, BORDER_WIDTH), (float)GuiGetStyle(PROGRESSBAR, BORDER_WIDTH) }, 0, BLANK, GetColor(GuiGetStyle(PROGRESSBAR, BORDER_COLOR_FOCUSED)));
|
|
|
GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ bounds.x, bounds.y + 1, (float)GuiGetStyle(PROGRESSBAR, BORDER_WIDTH), bounds.height - 2 }, 0, BLANK, GetColor(GuiGetStyle(PROGRESSBAR, BORDER_COLOR_FOCUSED)));
|
|
|
GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ bounds.x, bounds.y + bounds.height - 1, (int)progress.width + (float)GuiGetStyle(PROGRESSBAR, BORDER_WIDTH), (float)GuiGetStyle(PROGRESSBAR, BORDER_WIDTH) }, 0, BLANK, GetColor(GuiGetStyle(PROGRESSBAR, BORDER_COLOR_FOCUSED)));
|
|
|
@@ -2937,6 +2937,7 @@ int GuiProgressBar(Rectangle bounds, const char *textLeft, const char *textRight
|
|
|
if (*value >= maxValue) GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ bounds.x + progress.width + 1, bounds.y, (float)GuiGetStyle(PROGRESSBAR, BORDER_WIDTH), bounds.height }, 0, BLANK, GetColor(GuiGetStyle(PROGRESSBAR, BORDER_COLOR_FOCUSED)));
|
|
|
else
|
|
|
{
|
|
|
+ // Draw borders not yet reached by value
|
|
|
GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ bounds.x + (int)progress.width + 1, bounds.y, bounds.width - (int)progress.width - 1, (float)GuiGetStyle(PROGRESSBAR, BORDER_WIDTH) }, 0, BLANK, GetColor(GuiGetStyle(PROGRESSBAR, BORDER_COLOR_NORMAL)));
|
|
|
GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ bounds.x + (int)progress.width + 1, bounds.y + bounds.height - 1, bounds.width - (int)progress.width - 1, (float)GuiGetStyle(PROGRESSBAR, BORDER_WIDTH) }, 0, BLANK, GetColor(GuiGetStyle(PROGRESSBAR, BORDER_COLOR_NORMAL)));
|
|
|
GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ bounds.x + bounds.width - 1, bounds.y + 1, (float)GuiGetStyle(PROGRESSBAR, BORDER_WIDTH), bounds.height - 2 }, 0, BLANK, GetColor(GuiGetStyle(PROGRESSBAR, BORDER_COLOR_NORMAL)));
|
|
|
@@ -3724,8 +3725,8 @@ int GuiGrid(Rectangle bounds, const char *text, float spacing, int subdivs, Vect
|
|
|
Vector2 mousePoint = GetMousePosition();
|
|
|
Vector2 currentMouseCell = { 0 };
|
|
|
|
|
|
- int linesV = ((int)(bounds.width/spacing))*subdivs + 1;
|
|
|
- int linesH = ((int)(bounds.height/spacing))*subdivs + 1;
|
|
|
+ int linesV = ((int)(bounds.width/spacing))*subdivs + subdivs;
|
|
|
+ int linesH = ((int)(bounds.height/spacing))*subdivs + subdivs;
|
|
|
|
|
|
// Update control
|
|
|
//--------------------------------------------------------------------
|
Ray