TheCloud/nuklear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed shelf scrolling + added addition screenshot

Browse Source
This commit is contained in:
vurtun 2015-05-09 19:42:31 +02:00
parent 2684857167
commit 048438b587
5 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Readme.md
View File

@ -26,6 +26,7 @@ Summary: It is only responsible for the actual user interface
## Gallery ## Gallery
![gui screenshot](/demo.png?raw=true) ![gui screenshot](/demo.png?raw=true)
![gui screenshot](/config.png?raw=true)
## Example ## Example
```c ```c

BIN
config.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

20
demo/demo.c
View File

@ -37,6 +37,7 @@ struct control_window {
gui_bool col_g_act; gui_bool col_g_act;
gui_bool col_b_act; gui_bool col_b_act;
gui_bool col_a_act; gui_bool col_a_act;
gui_size current;
struct gui_color color; struct gui_color color;
}; };
@ -244,13 +245,13 @@ color_tab(struct gui_panel_layout *panel, struct control_window *control, struct
{ {
gui_size i = 0; gui_size i = 0;
struct gui_panel_layout tab; struct gui_panel_layout tab;
static const char *labels[] = {"Text", "Panel", "Header", "Border", "Button", "Button Border", static const char *labels[] = {"Text:", "Panel:", "Header:", "Border:", "Button:", "Button Border:",
"Button Hovering", "Button Toggle", "Button Hovering Text", "Check", "Check BG", "Button Hovering:", "Button Toggle:", "Button Hovering Text:", "Check:", "Check BG:",
"Check Active", "Option", "Option BG", "Option Active", "Scroll", "Scroll Cursor", "Check Active:", "Option:", "Option BG:", "Option Active:", "Scroll:", "Scroll Cursor:",
"Slider", "Slider cursor", "Progress", "Progress Cursor", "Editbox", "Editbox Border", "Slider:", "Slider cursor:", "Progress:", "Progress Cursor:", "Editbox:", "Editbox Border:",
"Spinner", "Spinner Border", "Selector", "Selector Border", "Histo", "Hist Bars", "Spinner:", "Spinner Border:", "Selector:", "Selector Border:", "Histo:", "Histo Bars:",
"Histo Negative", "Histo Hovering", "Plot", "Plot Lines", "Plot Hightlight", "Histo Negative:", "Histo Hovering:", "Plot:", "Plot Lines:", "Plot Hightlight:",
"Scrollbar", "Scrollbar Cursor", "Scrollbar Border", "Table lines", "Scaler" "Scrollbar:", "Scrollbar Cursor:", "Scrollbar Border:", "Table lines:", "Scaler:"
}; };
control->color_min = gui_panel_tab_begin(panel, &tab, "Color", control->color_min); control->color_min = gui_panel_tab_begin(panel, &tab, "Color", control->color_min);
if (control->picker_act) { if (control->picker_act) {
@ -258,7 +259,7 @@ color_tab(struct gui_panel_layout *panel, struct control_window *control, struct
gui_panel_row(&tab, 30, 3); gui_panel_row(&tab, 30, 3);
gui_panel_seperator(&tab, 1); gui_panel_seperator(&tab, 1);
if (gui_panel_button_text(&tab, "ok", GUI_BUTTON_DEFAULT)) { if (gui_panel_button_text(&tab, "ok", GUI_BUTTON_DEFAULT)) {
config->colors[i] = control->color; config->colors[control->current] = control->color;
control->picker_act = gui_false; control->picker_act = gui_false;
} }
if (gui_panel_button_text(&tab, "cancel", GUI_BUTTON_DEFAULT)) if (gui_panel_button_text(&tab, "cancel", GUI_BUTTON_DEFAULT))
@ -267,11 +268,12 @@ color_tab(struct gui_panel_layout *panel, struct control_window *control, struct
gui_panel_row(&tab, 30, 2); gui_panel_row(&tab, 30, 2);
for (i = 0; i < GUI_COLOR_COUNT; ++i) { for (i = 0; i < GUI_COLOR_COUNT; ++i) {
struct gui_panel_layout layout; struct gui_panel_layout layout;
gui_panel_label(&tab, labels[i], GUI_TEXT_CENTERED); gui_panel_label(&tab, labels[i], GUI_TEXT_LEFT);
if (gui_panel_button_color(&tab, config->colors[i], GUI_BUTTON_DEFAULT)) { if (gui_panel_button_color(&tab, config->colors[i], GUI_BUTTON_DEFAULT)) {
if (!control->picker_act) { if (!control->picker_act) {
control->picker_act = gui_true; control->picker_act = gui_true;
control->color = config->colors[i]; control->color = config->colors[i];
control->current = i;
} else continue; } else continue;
} }
} }

48
gui.c
View File

@ -678,7 +678,7 @@ gui_buffer_input(gui_char *buffer, gui_size length, gui_size max,
gui_size gui_size
gui_edit(const struct gui_canvas *canvas, gui_float x, gui_float y, gui_float w, gui_edit(const struct gui_canvas *canvas, gui_float x, gui_float y, gui_float w,
gui_float h, gui_char *buffer, gui_size len, gui_size max, gui_bool *active, gui_float h, gui_char *buffer, gui_size len, gui_size max, gui_bool *active,
const struct gui_input_field *field, const struct gui_input *in, const struct gui_font *font) const struct gui_edit *field, const struct gui_input *in, const struct gui_font *font)
{ {
gui_float input_w, input_h; gui_float input_w, input_h;
gui_bool input_active; gui_bool input_active;
@ -1232,10 +1232,9 @@ gui_default_config(struct gui_config *config)
vec2_load(config->item_spacing, 10.0f, 4.0f); vec2_load(config->item_spacing, 10.0f, 4.0f);
vec2_load(config->item_padding, 4.0f, 4.0f); vec2_load(config->item_padding, 4.0f, 4.0f);
vec2_load(config->scaler_size, 16.0f, 16.0f); vec2_load(config->scaler_size, 16.0f, 16.0f);
/*col_load(config->colors[GUI_COLOR_TEXT], 200, 200, 200, 255);*/
col_load(config->colors[GUI_COLOR_TEXT], 100, 100, 100, 255); col_load(config->colors[GUI_COLOR_TEXT], 100, 100, 100, 255);
col_load(config->colors[GUI_COLOR_PANEL], 45, 45, 45, 255); col_load(config->colors[GUI_COLOR_PANEL], 45, 45, 45, 255);
/*col_load(config->colors[GUI_COLOR_HEADER], 76, 88, 68, 255);*/ col_load(config->colors[GUI_COLOR_HEADER], 76, 88, 68, 255);
col_load(config->colors[GUI_COLOR_HEADER], 45, 45, 45, 255); col_load(config->colors[GUI_COLOR_HEADER], 45, 45, 45, 255);
col_load(config->colors[GUI_COLOR_BORDER], 100, 100, 100, 255); col_load(config->colors[GUI_COLOR_BORDER], 100, 100, 100, 255);
col_load(config->colors[GUI_COLOR_BUTTON], 50, 50, 50, 255); col_load(config->colors[GUI_COLOR_BUTTON], 50, 50, 50, 255);
@ -1951,26 +1950,25 @@ gui_panel_edit(struct gui_panel_layout *layout, gui_char *buffer, gui_size len,
{ {
struct gui_rect *c; struct gui_rect *c;
struct gui_rect bounds; struct gui_rect bounds;
struct gui_input_field field; struct gui_edit field;
const struct gui_config *config; const struct gui_config *config;
ASSERT(layout); ASSERT(layout);
ASSERT(layout->config); ASSERT(layout->config);
ASSERT(layout->canvas); ASSERT(layout->canvas);
if (!layout || !layout->config || !layout->canvas) return 0; if (!layout || !layout->config || !layout->canvas) return len;
if (!layout->valid) return 0; if (!layout->valid) return len;
gui_panel_alloc_space(&bounds, layout); gui_panel_alloc_space(&bounds, layout);
config = layout->config; config = layout->config;
c = &layout->clip; c = &layout->clip;
if (!INTERSECT(c->x, c->y, c->w, c->h, bounds.x, bounds.y, bounds.w, bounds.h)) if (!INTERSECT(c->x, c->y, c->w, c->h, bounds.x, bounds.y, bounds.w, bounds.h))
return 0; return len;
field.padding.x = config->item_padding.x; field.padding.x = config->item_padding.x;
field.padding.y = config->item_padding.y; field.padding.y = config->item_padding.y;
field.filter = filter; field.filter = filter;
field.show_cursor = gui_true; field.show_cursor = gui_true;
field.font = config->colors[GUI_COLOR_TEXT];
field.background = config->colors[GUI_COLOR_INPUT]; field.background = config->colors[GUI_COLOR_INPUT];
field.foreground = config->colors[GUI_COLOR_INPUT_BORDER]; field.foreground = config->colors[GUI_COLOR_INPUT_BORDER];
return gui_edit(layout->canvas, bounds.x, bounds.y, bounds.w, bounds.h, return gui_edit(layout->canvas, bounds.x, bounds.y, bounds.w, bounds.h,
@ -1983,7 +1981,7 @@ gui_panel_shell(struct gui_panel_layout *layout, gui_char *buffer, gui_size *len
{ {
struct gui_rect *c; struct gui_rect *c;
struct gui_rect bounds; struct gui_rect bounds;
struct gui_input_field field; struct gui_edit field;
struct gui_button button; struct gui_button button;
gui_float button_x, button_y; gui_float button_x, button_y;
gui_float button_w, button_h; gui_float button_w, button_h;
@ -1997,13 +1995,13 @@ gui_panel_shell(struct gui_panel_layout *layout, gui_char *buffer, gui_size *len
ASSERT(layout->config); ASSERT(layout->config);
ASSERT(layout->canvas); ASSERT(layout->canvas);
if (!layout || !layout->config || !layout->canvas) return 0; if (!layout || !layout->config || !layout->canvas) return *active;
if (!layout->valid) return 0; if (!layout->valid) return *active;
gui_panel_alloc_space(&bounds, layout); gui_panel_alloc_space(&bounds, layout);
config = layout->config; config = layout->config;
c = &layout->clip; c = &layout->clip;
if (!INTERSECT(c->x, c->y, c->w, c->h, bounds.x, bounds.y, bounds.w, bounds.h)) if (!INTERSECT(c->x, c->y, c->w, c->h, bounds.x, bounds.y, bounds.w, bounds.h))
return 0; return *active;
width = layout->font.width(layout->font.userdata, (const gui_char*)"submit", 6); width = layout->font.width(layout->font.userdata, (const gui_char*)"submit", 6);
button.border = 1; button.border = 1;
@ -2030,7 +2028,6 @@ gui_panel_shell(struct gui_panel_layout *layout, gui_char *buffer, gui_size *len
field.padding.y = config->item_padding.y; field.padding.y = config->item_padding.y;
field.filter = GUI_INPUT_DEFAULT; field.filter = GUI_INPUT_DEFAULT;
field.show_cursor = gui_true; field.show_cursor = gui_true;
field.font = config->colors[GUI_COLOR_TEXT];
field.background = config->colors[GUI_COLOR_INPUT]; field.background = config->colors[GUI_COLOR_INPUT];
field.foreground = config->colors[GUI_COLOR_INPUT_BORDER]; field.foreground = config->colors[GUI_COLOR_INPUT_BORDER];
*len = gui_edit(layout->canvas, field_x, field_y, field_w, field_h, buffer, *len = gui_edit(layout->canvas, field_x, field_y, field_w, field_h, buffer,
@ -2046,7 +2043,7 @@ gui_panel_spinner(struct gui_panel_layout *layout, gui_int min, gui_int value,
struct gui_rect *c; struct gui_rect *c;
const struct gui_config *config; const struct gui_config *config;
const struct gui_canvas *canvas; const struct gui_canvas *canvas;
struct gui_input_field field; struct gui_edit field;
char string[MAX_NUMBER_BUFFER]; char string[MAX_NUMBER_BUFFER];
gui_size len, old_len; gui_size len, old_len;
@ -2106,7 +2103,6 @@ gui_panel_spinner(struct gui_panel_layout *layout, gui_int min, gui_int value,
field.padding.y = config->item_padding.y; field.padding.y = config->item_padding.y;
field.filter = GUI_INPUT_FLOAT; field.filter = GUI_INPUT_FLOAT;
field.show_cursor = gui_false; field.show_cursor = gui_false;
field.font = config->colors[GUI_COLOR_TEXT];
field.background = config->colors[GUI_COLOR_SPINNER]; field.background = config->colors[GUI_COLOR_SPINNER];
field.foreground = config->colors[GUI_COLOR_SPINNER_BORDER]; field.foreground = config->colors[GUI_COLOR_SPINNER_BORDER];
len = gui_edit(canvas, field_x, field_y, field_w, field_h, (gui_char*)string, len = gui_edit(canvas, field_x, field_y, field_w, field_h, (gui_char*)string,
@ -2142,14 +2138,14 @@ gui_panel_selector(struct gui_panel_layout *layout, const char *items[],
ASSERT(item_count); ASSERT(item_count);
ASSERT(item_current < item_count); ASSERT(item_current < item_count);
if (!layout || !layout->config || !layout->canvas) return 0; if (!layout || !layout->config || !layout->canvas) return item_current;
if (!layout->valid) return 0; if (!layout->valid) return item_current;
gui_panel_alloc_space(&bounds, layout); gui_panel_alloc_space(&bounds, layout);
config = layout->config; config = layout->config;
canvas = layout->canvas; canvas = layout->canvas;
c = &layout->clip; c = &layout->clip;
if (!INTERSECT(c->x, c->y, c->w, c->h, bounds.x, bounds.y, bounds.w, bounds.h)) if (!INTERSECT(c->x, c->y, c->w, c->h, bounds.x, bounds.y, bounds.w, bounds.h))
return 0; return item_current;
canvas->draw_rect(canvas->userdata, bounds.x, bounds.y, bounds.w, bounds.h, canvas->draw_rect(canvas->userdata, bounds.x, bounds.y, bounds.w, bounds.h,
config->colors[GUI_COLOR_SELECTOR_BORDER]); config->colors[GUI_COLOR_SELECTOR_BORDER]);
@ -2319,6 +2315,9 @@ gui_panel_graph_push_histo(struct gui_panel_layout *layout,
gui_bool gui_bool
gui_panel_graph_push(struct gui_panel_layout *layout, struct gui_graph *graph, gui_float value) gui_panel_graph_push(struct gui_panel_layout *layout, struct gui_graph *graph, gui_float value)
{ {
ASSERT(layout);
ASSERT(graph);
if (!layout || !graph || !layout->valid) return gui_false;
if (graph->type == GUI_GRAPH_LINES) if (graph->type == GUI_GRAPH_LINES)
return gui_panel_graph_push_line(layout, graph, value); return gui_panel_graph_push_line(layout, graph, value);
else if (graph->type == GUI_GRAPH_HISTO) else if (graph->type == GUI_GRAPH_HISTO)
@ -2355,7 +2354,7 @@ gui_panel_graph(struct gui_panel_layout *layout, enum gui_graph_type type,
ASSERT(layout); ASSERT(layout);
ASSERT(values); ASSERT(values);
ASSERT(count); ASSERT(count);
if (!layout || !values || !count) if (!layout || !layout->valid || !values || !count)
return -1; return -1;
max_value = values[0]; max_value = values[0];
@ -2390,7 +2389,7 @@ gui_panel_graph_ex(struct gui_panel_layout *layout, enum gui_graph_type type,
ASSERT(layout); ASSERT(layout);
ASSERT(get_value); ASSERT(get_value);
ASSERT(count); ASSERT(count);
if (!layout || !get_value || !count) if (!layout || !layout->valid || !get_value || !count)
return -1; return -1;
max_value = get_value(userdata, 0); max_value = get_value(userdata, 0);
@ -2678,9 +2677,10 @@ gui_panel_shelf_begin(struct gui_panel_layout *parent, struct gui_panel_layout *
bounds.h -= header_h; bounds.h -= header_h;
flags = GUI_PANEL_BORDER|GUI_PANEL_SCROLLBAR|GUI_PANEL_TAB|GUI_PANEL_NO_HEADER; flags = GUI_PANEL_BORDER|GUI_PANEL_SCROLLBAR|GUI_PANEL_TAB|GUI_PANEL_NO_HEADER;
gui_panel_init(&panel, bounds.x,bounds.y,bounds.w,bounds.h,flags,parent->config,&parent->font); gui_panel_init(&panel, bounds.x, bounds.y, bounds.w, bounds.h, flags, config, &parent->font);
gui_panel_begin(shelf, &panel, NULL, parent->canvas, parent->input); gui_panel_begin(shelf, &panel, NULL, canvas, parent->input);
shelf->offset = offset; shelf->offset = offset;
unify(&clip, &parent->clip, shelf->clip.x, shelf->clip.y, unify(&clip, &parent->clip, shelf->clip.x, shelf->clip.y,
shelf->clip.x + shelf->clip.w, shelf->clip.y + shelf->clip.h); shelf->clip.x + shelf->clip.w, shelf->clip.y + shelf->clip.h);
canvas->scissor(canvas->userdata, clip.x, clip.y, clip.w, clip.h); canvas->scissor(canvas->userdata, clip.x, clip.y, clip.w, clip.h);
@ -2715,7 +2715,7 @@ gui_panel_shelf_end(struct gui_panel_layout *parent, struct gui_panel_layout *sh
canvas->scissor(canvas->userdata, clip.x, clip.y, clip.w, clip.h); canvas->scissor(canvas->userdata, clip.x, clip.y, clip.w, clip.h);
gui_panel_end(shelf, &panel); gui_panel_end(shelf, &panel);
canvas->scissor(canvas->userdata, parent->clip.x,parent->clip.y,parent->clip.w,parent->clip.h); canvas->scissor(canvas->userdata, parent->clip.x,parent->clip.y,parent->clip.w,parent->clip.h);
return shelf->offset; return panel.offset;
} }
void void
@ -2751,7 +2751,7 @@ gui_panel_end(struct gui_panel_layout *layout, struct gui_panel *panel)
scroll.foreground = config->colors[GUI_COLOR_SCROLLBAR_CURSOR]; scroll.foreground = config->colors[GUI_COLOR_SCROLLBAR_CURSOR];
scroll.border = config->colors[GUI_COLOR_SCROLLBAR_BORDER]; scroll.border = config->colors[GUI_COLOR_SCROLLBAR_BORDER];
if (panel->flags & GUI_PANEL_BORDER) scroll_h -= 1; if (panel->flags & GUI_PANEL_BORDER) scroll_h -= 1;
scroll_target = (layout->at_y - layout->y) - layout->header_height; scroll_target = (layout->at_y - layout->y) - (layout->header_height + 2 * config->item_spacing.y);
panel->offset = gui_scroll(canvas, scroll_x, scroll_y, scroll_w, scroll_h, panel->offset = gui_scroll(canvas, scroll_x, scroll_y, scroll_w, scroll_h,
scroll_offset, scroll_target, scroll_step, scroll_offset, scroll_target, scroll_step,
&scroll, layout->input); &scroll, layout->input);

5
gui.h
View File

@ -150,13 +150,12 @@ enum gui_input_filter {
GUI_INPUT_BIN GUI_INPUT_BIN
}; };
struct gui_input_field { struct gui_edit {
struct gui_vec2 padding; struct gui_vec2 padding;
gui_bool show_cursor; gui_bool show_cursor;
enum gui_input_filter filter; enum gui_input_filter filter;
struct gui_color background; struct gui_color background;
struct gui_color foreground; struct gui_color foreground;
struct gui_color font;
}; };
enum gui_graph_type { enum gui_graph_type {
@ -509,7 +508,7 @@ gui_size gui_progress(const struct gui_canvas*, gui_float x, gui_float y, gui_fl
const struct gui_slider*, const struct gui_input*); const struct gui_slider*, const struct gui_input*);
gui_size gui_edit(const struct gui_canvas*, gui_float x, gui_float y, gui_float w, gui_size gui_edit(const struct gui_canvas*, gui_float x, gui_float y, gui_float w,
gui_float h, gui_char*, gui_size, gui_size max, gui_bool*, gui_float h, gui_char*, gui_size, gui_size max, gui_bool*,
const struct gui_input_field*, const struct gui_input*, const struct gui_font*); const struct gui_edit*, const struct gui_input*, const struct gui_font*);
gui_float gui_scroll(const struct gui_canvas*, gui_float x, gui_float y, gui_float gui_scroll(const struct gui_canvas*, gui_float x, gui_float y,
gui_float w, gui_float h, gui_float offset, gui_float target, gui_float w, gui_float h, gui_float offset, gui_float target,
gui_float step, const struct gui_scroll*, const struct gui_input*); gui_float step, const struct gui_scroll*, const struct gui_input*);