|
@@ -3085,7 +3085,7 @@ int GuiProgressBar(Rectangle bounds, const char *textLeft, const char *textRight
|
|
if (*value > maxValue) *value = maxValue;
|
|
if (*value > maxValue) *value = maxValue;
|
|
|
|
|
|
// WARNING: Working with floats could lead to rounding issues
|
|
// WARNING: Working with floats could lead to rounding issues
|
|
- if ((state != STATE_DISABLED)) progress.width = (float)(*value/(maxValue - minValue))*bounds.width - ((*value >= maxValue) ? (float)(2*GuiGetStyle(PROGRESSBAR, BORDER_WIDTH)) : 0.0f);
|
|
|
|
|
|
+ if ((state != STATE_DISABLED)) progress.width = (float)(*value/(maxValue - minValue))*bounds.width - ((*value >= maxValue)? (float)(2*GuiGetStyle(PROGRESSBAR, BORDER_WIDTH)) : 0.0f);
|
|
//--------------------------------------------------------------------
|
|
//--------------------------------------------------------------------
|
|
|
|
|
|
// Draw control
|
|
// Draw control
|
|
@@ -3367,7 +3367,7 @@ int GuiColorPanel(Rectangle bounds, const char *text, Color *color)
|
|
pickerSelector.y = bounds.y + (1.0f - (float)hsv.z)*bounds.height; // HSV: Value
|
|
pickerSelector.y = bounds.y + (1.0f - (float)hsv.z)*bounds.height; // HSV: Value
|
|
|
|
|
|
float hue = -1.0f;
|
|
float hue = -1.0f;
|
|
- Vector3 maxHue = { hue >= 0.0f ? hue : hsv.x, 1.0f, 1.0f };
|
|
|
|
|
|
+ Vector3 maxHue = { (hue >= 0.0f)? hue : hsv.x, 1.0f, 1.0f };
|
|
Vector3 rgbHue = ConvertHSVtoRGB(maxHue);
|
|
Vector3 rgbHue = ConvertHSVtoRGB(maxHue);
|
|
Color maxHueCol = { (unsigned char)(255.0f*rgbHue.x),
|
|
Color maxHueCol = { (unsigned char)(255.0f*rgbHue.x),
|
|
(unsigned char)(255.0f*rgbHue.y),
|
|
(unsigned char)(255.0f*rgbHue.y),
|
|
@@ -3681,7 +3681,7 @@ int GuiColorPanelHSV(Rectangle bounds, const char *text, Vector3 *colorHsv)
|
|
pickerSelector.y = bounds.y + (1.0f - (float)colorHsv->z)*bounds.height; // HSV: Value
|
|
pickerSelector.y = bounds.y + (1.0f - (float)colorHsv->z)*bounds.height; // HSV: Value
|
|
|
|
|
|
float hue = -1.0f;
|
|
float hue = -1.0f;
|
|
- Vector3 maxHue = { hue >= 0.0f ? hue : colorHsv->x, 1.0f, 1.0f };
|
|
|
|
|
|
+ Vector3 maxHue = { (hue >= 0.0f)? hue : colorHsv->x, 1.0f, 1.0f };
|
|
Vector3 rgbHue = ConvertHSVtoRGB(maxHue);
|
|
Vector3 rgbHue = ConvertHSVtoRGB(maxHue);
|
|
Color maxHueCol = { (unsigned char)(255.0f*rgbHue.x),
|
|
Color maxHueCol = { (unsigned char)(255.0f*rgbHue.x),
|
|
(unsigned char)(255.0f*rgbHue.y),
|
|
(unsigned char)(255.0f*rgbHue.y),
|