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

fixed zr_spacing

Browse Source
This commit is contained in:
vurtun 2015-11-23 12:52:21 +01:00
parent 3e6d7bb1ec
commit a59a5f54d6
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
demo/demo.c
View File

@ -61,7 +61,6 @@ show_test_window(struct zr_window *window, struct zr_style *config, enum theme *
/* collapsable headers */ /* collapsable headers */
static int window_option_state = ZR_MINIMIZED; static int window_option_state = ZR_MINIMIZED;
static int header_option_state = ZR_MINIMIZED;
static int widget_state = ZR_MINIMIZED; static int widget_state = ZR_MINIMIZED;
static int graph_state = ZR_MINIMIZED; static int graph_state = ZR_MINIMIZED;
static int style_state = ZR_MINIMIZED; static int style_state = ZR_MINIMIZED;
@ -283,17 +282,8 @@ show_test_window(struct zr_window *window, struct zr_style *config, enum theme *
zr_checkbox(&layout, "Resizable", &resize); zr_checkbox(&layout, "Resizable", &resize);
zr_checkbox(&layout, "Moveable", &moveable); zr_checkbox(&layout, "Moveable", &moveable);
zr_checkbox(&layout, "No Scrollbar", &no_scrollbar); zr_checkbox(&layout, "No Scrollbar", &no_scrollbar);
zr_layout_pop(&layout);
}
if (zr_layout_push(&layout, ZR_LAYOUT_TAB, "Header", &header_option_state))
{
/* header options */
zr_layout_row_dynamic(&layout, 30, 2);
zr_checkbox(&layout, "Minimizable", &minimizable); zr_checkbox(&layout, "Minimizable", &minimizable);
zr_checkbox(&layout, "Closeable", &close); zr_checkbox(&layout, "Closeable", &close);
zr_checkbox(&layout, "Scaleable", &scale);
zr_checkbox(&layout, "Moveable", &move);
zr_layout_pop(&layout); zr_layout_pop(&layout);
} }

10
zahnrad.c
View File

@ -6879,8 +6879,7 @@ zr_layout_pop(struct zr_context *layout)
void void
zr_spacing(struct zr_context *l, zr_size cols) zr_spacing(struct zr_context *l, zr_size cols)
{ {
zr_size i, n; zr_size i, index, rows;
zr_size index;
struct zr_rect nil; struct zr_rect nil;
ZR_ASSERT(l); ZR_ASSERT(l);
@ -6891,16 +6890,17 @@ zr_spacing(struct zr_context *l, zr_size cols)
/* spacing over row boundries */ /* spacing over row boundries */
index = (l->row.index + cols) % l->row.columns; index = (l->row.index + cols) % l->row.columns;
if (l->row.index + cols > l->row.columns) { rows = (l->row.index + cols) / l->row.columns;
zr_size rows = (l->row.index + cols) / l->row.columns; if (rows) {
for (i = 0; i < rows; ++i) for (i = 0; i < rows; ++i)
zr_panel_alloc_row(l); zr_panel_alloc_row(l);
cols = index;
} }
/* non table layout need to allocate space */ /* non table layout need to allocate space */
if (l->row.type != ZR_LAYOUT_DYNAMIC_FIXED && if (l->row.type != ZR_LAYOUT_DYNAMIC_FIXED &&
l->row.type != ZR_LAYOUT_STATIC_FIXED) { l->row.type != ZR_LAYOUT_STATIC_FIXED) {
for (i = 0; i < index; ++i) for (i = 0; i < cols; ++i)
zr_panel_alloc_space(&nil, l); zr_panel_alloc_space(&nil, l);
} }
l->row.index = index; l->row.index = index;