mirrors/Nuklear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed contextual

Browse Source
This commit is contained in:
vurtun 2016-01-03 13:36:25 +01:00
parent 224d91d89a
commit ffe8a98d62
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
example/demo/demo.c
View File

@ -131,6 +131,7 @@ ui_piemenu(struct zr_context *ctx,
zr_style_push_color(&ctx->style, ZR_COLOR_WINDOW, zr_rgba(0,0,0,0));
border = ctx->style.colors[ZR_COLOR_BORDER];
zr_style_push_color(&ctx->style, ZR_COLOR_BORDER, zr_rgba(0,0,0,0));
if (ctx->current != ctx->active) return 0;
/* pie menu popup */
total_space = zr_window_get_content_region(ctx);

17
zahnrad.c
View File

@ -6831,6 +6831,22 @@ zr_window_is_closed(struct zr_context *ctx, const char *name)
return win->flags & ZR_WINDOW_HIDDEN;
}
int
zr_window_is_active(struct zr_context *ctx, const char *name)
{
int title_len;
zr_hash title_hash;
struct zr_window *win;
ZR_ASSERT(ctx);
if (!ctx) return 0;
title_len = (int)zr_strsiz(name);
title_hash = zr_murmur_hash(name, (int)title_len, ZR_WINDOW_TITLE);
win = zr_find_window(ctx, title_hash);
if (!win) return 0;
return win == ctx->active;
}
void
zr_window_set_bounds(struct zr_context *ctx, struct zr_rect bounds)
{
@ -9729,6 +9745,7 @@ zr_contextual_begin(struct zr_context *ctx, struct zr_layout *layout,
is_clicked = zr_input_is_mouse_click_in_rect(&ctx->input, ZR_BUTTON_RIGHT, win->layout->bounds);
is_open = (popup && (popup->flags & ZR_WINDOW_CONTEXTUAL) && win->popup.type == ZR_WINDOW_CONTEXTUAL);
if ((is_clicked && is_open && !is_active) || (!is_open && !is_active && !is_clicked)) return 0;
if (ctx->current != ctx->active) return 0;
if (is_clicked) {
body.x = ctx->input.mouse.pos.x;

1
zahnrad.h
View File

@ -1318,6 +1318,7 @@ struct zr_command_buffer* zr_window_get_canvas(struct zr_context*);
int zr_window_has_focus(const struct zr_context*);
int zr_window_is_collapsed(struct zr_context*, const char *name);
int zr_window_is_closed(struct zr_context*, const char *name);
int zr_window_is_active(struct zr_context*, const char *name);
void zr_window_set_bounds(struct zr_context*, struct zr_rect);
void zr_window_set_position(struct zr_context*, struct zr_vec2);