mirror of
https://github.com/raysan5/raygui.git
synced 2025-12-25 10:22:33 -05:00
REMOVED: GuiSliderPro(), functionality was redundant
This commit is contained in:
20
src/raygui.h
20
src/raygui.h
@ -149,6 +149,7 @@
|
|||||||
* ADDED: GuiLoadIconsFromMemory()
|
* ADDED: GuiLoadIconsFromMemory()
|
||||||
* ADDED: Multiple new icons
|
* ADDED: Multiple new icons
|
||||||
* REMOVED: GuiSpinner() from controls list, using BUTTON + VALUEBOX properties
|
* REMOVED: GuiSpinner() from controls list, using BUTTON + VALUEBOX properties
|
||||||
|
* REMOVED: GuiSliderPro(), functionality was redundant
|
||||||
* REVIEWED: Controls using text labels to use LABEL properties
|
* REVIEWED: Controls using text labels to use LABEL properties
|
||||||
* REVIEWED: Replaced sprintf() by snprintf() for more safety
|
* REVIEWED: Replaced sprintf() by snprintf() for more safety
|
||||||
* REVIEWED: GuiTabBar(), close tab with mouse middle button
|
* REVIEWED: GuiTabBar(), close tab with mouse middle button
|
||||||
@ -754,7 +755,6 @@ RAYGUIAPI int GuiValueBoxFloat(Rectangle bounds, const char *text, char *textVal
|
|||||||
RAYGUIAPI int GuiTextBox(Rectangle bounds, char *text, int textSize, bool editMode); // Text Box control, updates input text
|
RAYGUIAPI int GuiTextBox(Rectangle bounds, char *text, int textSize, bool editMode); // Text Box control, updates input text
|
||||||
|
|
||||||
RAYGUIAPI int GuiSlider(Rectangle bounds, const char *textLeft, const char *textRight, float *value, float minValue, float maxValue); // Slider control
|
RAYGUIAPI int GuiSlider(Rectangle bounds, const char *textLeft, const char *textRight, float *value, float minValue, float maxValue); // Slider control
|
||||||
RAYGUIAPI int GuiSliderPro(Rectangle bounds, const char *textLeft, const char *textRight, float *value, float minValue, float maxValue, int sliderWidth); // Slider control with extended parameters
|
|
||||||
RAYGUIAPI int GuiSliderBar(Rectangle bounds, const char *textLeft, const char *textRight, float *value, float minValue, float maxValue); // Slider Bar control
|
RAYGUIAPI int GuiSliderBar(Rectangle bounds, const char *textLeft, const char *textRight, float *value, float minValue, float maxValue); // Slider Bar control
|
||||||
RAYGUIAPI int GuiProgressBar(Rectangle bounds, const char *textLeft, const char *textRight, float *value, float minValue, float maxValue); // Progress Bar control
|
RAYGUIAPI int GuiProgressBar(Rectangle bounds, const char *textLeft, const char *textRight, float *value, float minValue, float maxValue); // Progress Bar control
|
||||||
RAYGUIAPI int GuiStatusBar(Rectangle bounds, const char *text); // Status Bar control, shows info text
|
RAYGUIAPI int GuiStatusBar(Rectangle bounds, const char *text); // Status Bar control, shows info text
|
||||||
@ -3239,7 +3239,7 @@ int GuiValueBoxFloat(Rectangle bounds, const char *text, char *textValue, float
|
|||||||
|
|
||||||
// Slider control with pro parameters
|
// Slider control with pro parameters
|
||||||
// NOTE: Other GuiSlider*() controls use this one
|
// NOTE: Other GuiSlider*() controls use this one
|
||||||
int GuiSliderPro(Rectangle bounds, const char *textLeft, const char *textRight, float *value, float minValue, float maxValue, int sliderWidth)
|
int GuiSlider(Rectangle bounds, const char *textLeft, const char *textRight, float *value, float minValue, float maxValue)
|
||||||
{
|
{
|
||||||
int result = 0;
|
int result = 0;
|
||||||
GuiState state = guiState;
|
GuiState state = guiState;
|
||||||
@ -3248,6 +3248,8 @@ int GuiSliderPro(Rectangle bounds, const char *textLeft, const char *textRight,
|
|||||||
if (value == NULL) value = &temp;
|
if (value == NULL) value = &temp;
|
||||||
float oldValue = *value;
|
float oldValue = *value;
|
||||||
|
|
||||||
|
int sliderWidth = GuiGetStyle(SLIDER, SLIDER_WIDTH);
|
||||||
|
|
||||||
Rectangle slider = { bounds.x, bounds.y + GuiGetStyle(SLIDER, BORDER_WIDTH) + GuiGetStyle(SLIDER, SLIDER_PADDING),
|
Rectangle slider = { bounds.x, bounds.y + GuiGetStyle(SLIDER, BORDER_WIDTH) + GuiGetStyle(SLIDER, SLIDER_PADDING),
|
||||||
0, bounds.height - 2*GuiGetStyle(SLIDER, BORDER_WIDTH) - 2*GuiGetStyle(SLIDER, SLIDER_PADDING) };
|
0, bounds.height - 2*GuiGetStyle(SLIDER, BORDER_WIDTH) - 2*GuiGetStyle(SLIDER, SLIDER_PADDING) };
|
||||||
|
|
||||||
@ -3353,16 +3355,16 @@ int GuiSliderPro(Rectangle bounds, const char *textLeft, const char *textRight,
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Slider control extended, returns selected value and has text
|
|
||||||
int GuiSlider(Rectangle bounds, const char *textLeft, const char *textRight, float *value, float minValue, float maxValue)
|
|
||||||
{
|
|
||||||
return GuiSliderPro(bounds, textLeft, textRight, value, minValue, maxValue, GuiGetStyle(SLIDER, SLIDER_WIDTH));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Slider Bar control extended, returns selected value
|
// Slider Bar control extended, returns selected value
|
||||||
int GuiSliderBar(Rectangle bounds, const char *textLeft, const char *textRight, float *value, float minValue, float maxValue)
|
int GuiSliderBar(Rectangle bounds, const char *textLeft, const char *textRight, float *value, float minValue, float maxValue)
|
||||||
{
|
{
|
||||||
return GuiSliderPro(bounds, textLeft, textRight, value, minValue, maxValue, 0);
|
int result = 0;
|
||||||
|
int preSliderWidth = GuiGetStyle(SLIDER, SLIDER_WIDTH);
|
||||||
|
GuiSetStyle(SLIDER, SLIDER_WIDTH, 0);
|
||||||
|
result = GuiSlider(bounds, textLeft, textRight, value, minValue, maxValue);
|
||||||
|
GuiSetStyle(SLIDER, SLIDER_WIDTH, preSliderWidth);
|
||||||
|
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Progress Bar control extended, shows current progress value
|
// Progress Bar control extended, shows current progress value
|
||||||
|
|||||||
Reference in New Issue
Block a user