mirrors
/
Nuklear
mirror of https://github.com/Immediate-Mode-UI/Nuklear
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ands-master'

This commit is contained in:
vurtun 2016-06-11 11:12:46 +02:00
parent 3eafc226ef 07cffde659
commit f7575a9962
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nuklear.h
View File

@ -15227,7 +15227,7 @@ nk_window_is_any_hovered(struct nk_context *ctx)
return 1;
}
/* check if window popup is being hovered */
if (iter->popup.active && nk_input_is_mouse_hovering_rect(&ctx->input, iter->popup.win->bounds))
if (iter->popup.active && iter->popup.win && nk_input_is_mouse_hovering_rect(&ctx->input, iter->popup.win->bounds))
return 1;
iter = iter->next;
}
@ -16623,7 +16623,7 @@ nk_tree_base(struct nk_context *ctx, enum nk_tree_type type,
nk_flags ws = 0;
int title_len = 0;
nk_hash title_hash = 0;
nk_hash tree_hash = 0;
nk_uint *state = 0;
enum nk_widget_layout_states widget_state;
@ -16659,12 +16659,15 @@ nk_tree_base(struct nk_context *ctx, enum nk_tree_type type,
} else text.background = style->window.background;
/* find, create or set tab persistent state (open/closed) */
title_len = (int)nk_strlen(title);
title_hash = nk_murmur_hash(title, (int)title_len, (nk_hash)type);
if (hash) title_hash += nk_murmur_hash(hash, len, (nk_hash)line);
state = nk_find_value(win, title_hash);
if (hash) {
tree_hash = nk_murmur_hash(hash, len, (nk_hash)line);
} else {
title_len = (int)nk_strlen(title);
tree_hash = nk_murmur_hash(title, (int)title_len, (nk_hash)line);
}
state = nk_find_value(win, tree_hash);
if (!state) {
state = nk_add_value(ctx, win, title_hash, 0);
state = nk_add_value(ctx, win, tree_hash, 0);
*state = initial_state;
}