3party/raygui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reorder some controls info for consistency

Browse Source
This commit is contained in:
Ray 2019-06-18 13:30:26 +02:00
parent 88972a52b0
commit ce4d487642
1 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/raygui.h
View File

@ -306,19 +306,6 @@ typedef enum {
// ProgressBar // ProgressBar
//typedef enum { } GuiProgressBarProperty; //typedef enum { } GuiProgressBarProperty;
// TextBox / TextBoxMulti / ValueBox / Spinner
typedef enum {
MULTILINE_PADDING = 16,
COLOR_SELECTED_FG,
COLOR_SELECTED_BG
} GuiTextBoxProperty;
typedef enum {
SELECT_BUTTON_WIDTH = 16,
SELECT_BUTTON_PADDING,
SELECT_BUTTON_BORDER_WIDTH
} GuiSpinnerProperty;
// CheckBox // CheckBox
typedef enum { typedef enum {
CHECK_TEXT_PADDING = 16 CHECK_TEXT_PADDING = 16
@ -335,22 +322,18 @@ typedef enum {
ARROW_RIGHT_PADDING = 16, ARROW_RIGHT_PADDING = 16,
} GuiDropdownBoxProperty; } GuiDropdownBoxProperty;
// ColorPicker // TextBox / TextBoxMulti / ValueBox / Spinner
typedef enum { typedef enum {
COLOR_SELECTOR_SIZE = 16, MULTILINE_PADDING = 16,
BAR_WIDTH, // Lateral bar width COLOR_SELECTED_FG,
BAR_PADDING, // Lateral bar separation from panel COLOR_SELECTED_BG
BAR_SELECTOR_HEIGHT, // Lateral bar selector height } GuiTextBoxProperty;
BAR_SELECTOR_PADDING // Lateral bar selector outer padding
} GuiColorPickerProperty;
// ListView
typedef enum { typedef enum {
ELEMENTS_HEIGHT = 16, SELECT_BUTTON_WIDTH = 16,
ELEMENTS_PADDING, SELECT_BUTTON_PADDING,
SCROLLBAR_WIDTH, SELECT_BUTTON_BORDER_WIDTH
SCROLLBAR_SIDE, // This property defines vertical scrollbar side (SCROLLBAR_LEFT_SIDE or SCROLLBAR_RIGHT_SIDE) } GuiSpinnerProperty;
} GuiListViewProperty;
// ScrollBar // ScrollBar
typedef enum { typedef enum {
@ -367,6 +350,23 @@ typedef enum {
SCROLLBAR_RIGHT_SIDE SCROLLBAR_RIGHT_SIDE
} GuiScrollBarSide; } GuiScrollBarSide;
// ListView
typedef enum {
ELEMENTS_HEIGHT = 16,
ELEMENTS_PADDING,
SCROLLBAR_WIDTH,
SCROLLBAR_SIDE, // This property defines vertical scrollbar side (SCROLLBAR_LEFT_SIDE or SCROLLBAR_RIGHT_SIDE)
} GuiListViewProperty;
// ColorPicker
typedef enum {
COLOR_SELECTOR_SIZE = 16,
BAR_WIDTH, // Lateral bar width
BAR_PADDING, // Lateral bar separation from panel
BAR_SELECTOR_HEIGHT, // Lateral bar selector height
BAR_SELECTOR_PADDING // Lateral bar selector outer padding
} GuiColorPickerProperty;
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
// Global Variables Definition // Global Variables Definition
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
@ -4018,7 +4018,8 @@ RAYGUIDEF void GuiLoadStyle(const char *fileName)
// If a DEFAULT property is loaded, it is propagated to all controls, // If a DEFAULT property is loaded, it is propagated to all controls,
// all DEFAULT properties should be defined first in the file // all DEFAULT properties should be defined first in the file
GuiSetStyle(0, propertyId, propertyValue); GuiSetStyle(0, propertyId, propertyValue);
for (int i = 1; i < NUM_CONTROLS; i++) GuiSetStyle(i, propertyId, propertyValue);
if (propertyId < NUM_PROPS_DEFAULT) for (int i = 1; i < NUM_CONTROLS; i++) GuiSetStyle(i, propertyId, propertyValue);
} }
else GuiSetStyle(controlId, propertyId, propertyValue); else GuiSetStyle(controlId, propertyId, propertyValue);
@ -4202,22 +4203,22 @@ RAYGUIDEF void GuiLoadStyleDefault(void)
GuiSetStyle(SPINNER, SELECT_BUTTON_WIDTH, 20); GuiSetStyle(SPINNER, SELECT_BUTTON_WIDTH, 20);
GuiSetStyle(SPINNER, SELECT_BUTTON_PADDING, 2); GuiSetStyle(SPINNER, SELECT_BUTTON_PADDING, 2);
GuiSetStyle(SPINNER, SELECT_BUTTON_BORDER_WIDTH, 1); GuiSetStyle(SPINNER, SELECT_BUTTON_BORDER_WIDTH, 1);
GuiSetStyle(SCROLLBAR, BORDER_WIDTH, 0);
GuiSetStyle(SCROLLBAR, SHOW_SPINNER_BUTTONS, 0);
GuiSetStyle(SCROLLBAR, INNER_PADDING, 0);
GuiSetStyle(SCROLLBAR, ARROWS_SIZE, 6);
GuiSetStyle(SCROLLBAR, SLIDER_PADDING, 0);
GuiSetStyle(SCROLLBAR, SLIDER_SIZE, 16);
GuiSetStyle(SCROLLBAR, SCROLL_SPEED, 10);
GuiSetStyle(LISTVIEW, ELEMENTS_HEIGHT, 0x1e);
GuiSetStyle(LISTVIEW, ELEMENTS_PADDING, 2);
GuiSetStyle(LISTVIEW, SCROLLBAR_WIDTH, 10);
GuiSetStyle(LISTVIEW, SCROLLBAR_SIDE, SCROLLBAR_RIGHT_SIDE);
GuiSetStyle(COLORPICKER, COLOR_SELECTOR_SIZE, 6); GuiSetStyle(COLORPICKER, COLOR_SELECTOR_SIZE, 6);
GuiSetStyle(COLORPICKER, BAR_WIDTH, 0x14); GuiSetStyle(COLORPICKER, BAR_WIDTH, 0x14);
GuiSetStyle(COLORPICKER, BAR_PADDING, 0xa); GuiSetStyle(COLORPICKER, BAR_PADDING, 0xa);
GuiSetStyle(COLORPICKER, BAR_SELECTOR_HEIGHT, 6); GuiSetStyle(COLORPICKER, BAR_SELECTOR_HEIGHT, 6);
GuiSetStyle(COLORPICKER, BAR_SELECTOR_PADDING, 2); GuiSetStyle(COLORPICKER, BAR_SELECTOR_PADDING, 2);
GuiSetStyle(LISTVIEW, ELEMENTS_HEIGHT, 0x1e);
GuiSetStyle(LISTVIEW, ELEMENTS_PADDING, 2);
GuiSetStyle(LISTVIEW, SCROLLBAR_WIDTH, 10);
GuiSetStyle(LISTVIEW, SCROLLBAR_SIDE, SCROLLBAR_RIGHT_SIDE);
GuiSetStyle(SCROLLBAR, BORDER_WIDTH, 0);
GuiSetStyle(SCROLLBAR, SHOW_SPINNER_BUTTONS, 0);
GuiSetStyle(SCROLLBAR, ARROWS_SIZE, 6);
GuiSetStyle(SCROLLBAR, INNER_PADDING, 0);
GuiSetStyle(SCROLLBAR, SLIDER_PADDING, 0);
GuiSetStyle(SCROLLBAR, SLIDER_SIZE, 16);
GuiSetStyle(SCROLLBAR, SCROLL_SPEED, 10);
} }
// Updates controls style with default values // Updates controls style with default values