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

Merge branch 'Predelnik-userdata-fix'

Browse Source
This commit is contained in:
vurtun 2017-11-27 20:28:40 +01:00
commit 1d8aae2bba
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nuklear.h
View File

@ -7968,10 +7968,16 @@ nk_draw_list_push_image(struct nk_draw_list *list, nk_handle texture)
nk_draw_list_push_command(list, nk_null_rect, texture);
} else {
struct nk_draw_command *prev = nk_draw_list_command_last(list);
if (prev->elem_count == 0)
if (prev->elem_count == 0) {
prev->texture = texture;
else if (prev->texture.id != texture.id)
nk_draw_list_push_command(list, prev->clip_rect, texture);
#ifdef NK_INCLUDE_COMMAND_USERDATA
prev->userdata = list->userdata;
#endif
} else if (prev->texture.id != texture.id
#ifdef NK_INCLUDE_COMMAND_USERDATA
|| prev->userdata.id != list->userdata.id
#endif
) nk_draw_list_push_command(list, prev->clip_rect, texture);
}
}
@ -17408,7 +17414,7 @@ nk_clear(struct nk_context *ctx)
ctx->active = iter->prev;
ctx->end = iter->prev;
if (ctx->active)
ctx->active->flags &= ~NK_WINDOW_ROM;
ctx->active->flags &= ~(unsigned)NK_WINDOW_ROM;
}
/* free unused popup windows */
if (iter->popup.win && iter->popup.win->seq != ctx->seq) {