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

Fixed #511 and changed formatting

Browse Source
This commit is contained in:
vurtun 2017-11-27 20:27:02 +01:00
parent 988b40888b
commit 3636cb1c5d
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nuklear.h
View File

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