Fixed #657 contextual activation code

pull/659/head
vurtun 2018-04-04 16:39:42 +02:00
parent 60bd95c926
commit d374953d27
2 changed files with 4 additions and 0 deletions

View File

@ -16894,6 +16894,8 @@ nk_contextual_begin(struct nk_context *ctx, nk_flags flags, struct nk_vec2 size,
NK_ASSERT(ctx->current->layout);
if (!ctx || !ctx->current || !ctx->current->layout)
return 0;
if (ctx->current != ctx->active)
return 0;
win = ctx->current;
++win->popup.con_count;

View File

@ -25,6 +25,8 @@ nk_contextual_begin(struct nk_context *ctx, nk_flags flags, struct nk_vec2 size,
NK_ASSERT(ctx->current->layout);
if (!ctx || !ctx->current || !ctx->current->layout)
return 0;
if (ctx->current != ctx->active)
return 0;
win = ctx->current;
++win->popup.con_count;