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

simplified having more than contextual menu

Browse Source
This commit is contained in:
vurtun 2016-01-08 00:30:40 +01:00
parent 0a0ac13b57
commit 8d4284184c
3 changed files with 66 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
demo/demo.c
View File

@ -169,7 +169,7 @@ demo_window(struct zr_layout *layout, struct zr_context *ctx, enum theme *theme)
zr_layout_row_dynamic(ctx, 20, 1); zr_layout_row_dynamic(ctx, 20, 1);
zr_label(ctx, "Zahnrad", ZR_TEXT_LEFT); zr_label(ctx, "Zahnrad", ZR_TEXT_LEFT);
zr_label(ctx, "By Micha Mettke", ZR_TEXT_LEFT); zr_label(ctx, "By Micha Mettke", ZR_TEXT_LEFT);
zr_label(ctx, "Zahnrad is licensed under the MIT License.", ZR_TEXT_LEFT); zr_label(ctx, "Zahnrad is licensed under the zlib License.", ZR_TEXT_LEFT);
zr_label(ctx, "See LICENSE for more information", ZR_TEXT_LEFT); zr_label(ctx, "See LICENSE for more information", ZR_TEXT_LEFT);
zr_popup_end(ctx); zr_popup_end(ctx);
} else show_app_about = zr_false; } else show_app_about = zr_false;
@ -653,63 +653,53 @@ demo_window(struct zr_layout *layout, struct zr_context *ctx, enum theme *theme)
if (zr_layout_push(ctx, ZR_LAYOUT_TAB, "Popup")) if (zr_layout_push(ctx, ZR_LAYOUT_TAB, "Popup"))
{ {
enum {NONE=0, MENU=1, COLOR=2};
static int active = MENU;
static struct zr_color color = {255,0,0, 255}; static struct zr_color color = {255,0,0, 255};
static int select[4]; static int select[4];
static int popup_active; static int popup_active;
const struct zr_input *in = &ctx->input; const struct zr_input *in = &ctx->input;
struct zr_rect menu_bounds, color_bounds, bounds; struct zr_rect bounds;
int is_menu, is_color;
struct zr_vec2 size;
/* contextual */ /* menu contextual */
zr_layout_row_static(ctx, 30, 150, 1); zr_layout_row_static(ctx, 30, 150, 1);
zr_layout_peek(&menu_bounds, ctx); zr_layout_peek(&bounds, ctx);
zr_label(ctx, "Right click me for menu", ZR_TEXT_LEFT); zr_label(ctx, "Right click me for menu", ZR_TEXT_LEFT);
if (zr_contextual_begin(ctx, &menu, 0, zr_vec2(100, 200), bounds)) {
static size_t prog = 40;
static int slider = 10;
zr_layout_row_dynamic(ctx, 25, 1);
zr_checkbox(ctx, "Menu", &show_menu);
zr_progress(ctx, &prog, 100, ZR_MODIFIABLE);
zr_slider_int(ctx, 0, &slider, 16, 1);
zr_selectable(ctx, select[0]?"Unselect":"Select", ZR_TEXT_LEFT, &select[0]);
zr_selectable(ctx, select[1]?"Unselect":"Select", ZR_TEXT_LEFT, &select[1]);
zr_selectable(ctx, select[2]?"Unselect":"Select", ZR_TEXT_LEFT, &select[2]);
zr_selectable(ctx, select[3]?"Unselect":"Select", ZR_TEXT_LEFT, &select[3]);
if (zr_contextual_item(ctx, "About", ZR_TEXT_CENTERED))
show_app_about = zr_true;
if (zr_contextual_item(ctx, "Quit", ZR_TEXT_CENTERED))
show_close_popup = zr_true;
zr_contextual_end(ctx);
}
/* color contextual */ /* color contextual */
zr_layout_row_begin(ctx, ZR_STATIC, 30, 2); zr_layout_row_begin(ctx, ZR_STATIC, 30, 2);
zr_layout_row_push(ctx, 100); zr_layout_row_push(ctx, 100);
zr_label(ctx, "Right Click here:", ZR_TEXT_LEFT); zr_label(ctx, "Right Click here:", ZR_TEXT_LEFT);
zr_layout_row_push(ctx, 50); zr_layout_row_push(ctx, 50);
zr_layout_peek(&color_bounds, ctx); zr_layout_peek(&bounds, ctx);
zr_button_color(ctx, color, ZR_BUTTON_DEFAULT); zr_button_color(ctx, color, ZR_BUTTON_DEFAULT);
zr_layout_row_end(ctx); zr_layout_row_end(ctx);
/* This is a shitty hack to accomplish multiple contextual menus */ if (zr_contextual_begin(ctx, &menu, 0, zr_vec2(350, 60), bounds)) {
is_menu = zr_input_mouse_clicked(in, ZR_BUTTON_RIGHT, menu_bounds); zr_layout_row_dynamic(ctx, 30, 4);
is_color = zr_input_mouse_clicked(in, ZR_BUTTON_RIGHT, color_bounds); color.r = (zr_byte)zr_propertyi(ctx, "#r", 0, color.r, 255, 1, 1);
size = (is_color || active == COLOR) ? zr_vec2(350, 60): zr_vec2(100, 200); color.g = (zr_byte)zr_propertyi(ctx, "#g", 0, color.g, 255, 1, 1);
if (zr_contextual_begin(ctx, &menu, 0, size, is_color|is_menu)) { color.b = (zr_byte)zr_propertyi(ctx, "#b", 0, color.b, 255, 1, 1);
if (is_menu || active == MENU) { color.a = (zr_byte)zr_propertyi(ctx, "#a", 0, color.a, 255, 1, 1);
static size_t prog = 40;
static int slider = 10;
active = MENU;
zr_layout_row_dynamic(ctx, 25, 1);
zr_checkbox(ctx, "Menu", &show_menu);
zr_progress(ctx, &prog, 100, ZR_MODIFIABLE);
zr_slider_int(ctx, 0, &slider, 16, 1);
zr_selectable(ctx, select[0]?"Unselect":"Select", ZR_TEXT_LEFT, &select[0]);
zr_selectable(ctx, select[1]?"Unselect":"Select", ZR_TEXT_LEFT, &select[1]);
zr_selectable(ctx, select[2]?"Unselect":"Select", ZR_TEXT_LEFT, &select[2]);
zr_selectable(ctx, select[3]?"Unselect":"Select", ZR_TEXT_LEFT, &select[3]);
if (zr_contextual_item(ctx, "About", ZR_TEXT_CENTERED))
show_app_about = zr_true;
if (zr_contextual_item(ctx, "Quit", ZR_TEXT_CENTERED))
show_close_popup = zr_true;
} else if (is_color || active == COLOR){
active = COLOR;
zr_layout_row_dynamic(ctx, 30, 4);
color.r = (zr_byte)zr_propertyi(ctx, "#r", 0, color.r, 255, 1, 1);
color.g = (zr_byte)zr_propertyi(ctx, "#g", 0, color.g, 255, 1, 1);
color.b = (zr_byte)zr_propertyi(ctx, "#b", 0, color.b, 255, 1, 1);
color.a = (zr_byte)zr_propertyi(ctx, "#a", 0, color.a, 255, 1, 1);
}
zr_contextual_end(ctx); zr_contextual_end(ctx);
} else active = NONE; }
/* popup */ /* popup */
zr_layout_row_begin(ctx, ZR_STATIC, 30, 2); zr_layout_row_begin(ctx, ZR_STATIC, 30, 2);
@ -1109,16 +1099,17 @@ demo_window(struct zr_layout *layout, struct zr_context *ctx, enum theme *theme)
zr_group_end(ctx); zr_group_end(ctx);
} }
/* scaler */
zr_layout_row_dynamic(ctx, 8, 1);
zr_layout_peek(&bounds, ctx);
zr_spacing(ctx, 1);
if ((zr_input_is_mouse_hovering_rect(in, bounds) ||
zr_input_is_mouse_prev_hovering_rect(in, bounds)) &&
zr_input_is_mouse_down(in, ZR_BUTTON_LEFT))
{ {
b = b + in->mouse.delta.y; /* scaler */
c = c - in->mouse.delta.y; zr_layout_row_dynamic(ctx, 8, 1);
zr_layout_peek(&bounds, ctx);
if ((zr_input_is_mouse_hovering_rect(in, bounds) ||
zr_input_is_mouse_prev_hovering_rect(in, bounds)) &&
zr_input_is_mouse_down(in, ZR_BUTTON_LEFT))
{
b = b + in->mouse.delta.y;
c = c - in->mouse.delta.y;
}
} }
/* bottom space */ /* bottom space */

25
zahnrad.c
View File

@ -102,6 +102,9 @@ struct zr_popup {
enum zr_internal_window_flags type; enum zr_internal_window_flags type;
zr_ulong name; zr_ulong name;
int active; int active;
unsigned con_count, con_old;
unsigned active_con;
}; };
struct zr_edit_state { struct zr_edit_state {
@ -7557,6 +7560,16 @@ zr_layout_end(struct zr_context *ctx)
window->edit.prev = window->edit.active; window->edit.prev = window->edit.active;
window->edit.seq = 0; window->edit.seq = 0;
} }
/* contextual garabe collector */
if (window->popup.active_con && window->popup.con_old != window->popup.con_count) {
window->popup.con_count = 0;
window->popup.con_old = 0;
window->popup.active_con = 0;
} else {
window->popup.con_old = window->popup.con_count;
window->popup.con_count = 0;
}
} }
void void
@ -9745,6 +9758,7 @@ zr_tooltip_begin(struct zr_context *ctx, struct zr_layout *layout, float width)
if (!ctx || !ctx->current || !ctx->current->layout) return 0; if (!ctx || !ctx->current || !ctx->current->layout) return 0;
win = ctx->current; win = ctx->current;
if (win->popup.active_con) return 0;
in = &ctx->input; in = &ctx->input;
bounds.w = width; bounds.w = width;
bounds.h = zr_null_rect.h; bounds.h = zr_null_rect.h;
@ -9813,11 +9827,12 @@ zr_tooltip(struct zr_context *ctx, const char *text)
*/ */
int int
zr_contextual_begin(struct zr_context *ctx, struct zr_layout *layout, zr_contextual_begin(struct zr_context *ctx, struct zr_layout *layout,
zr_flags flags, struct zr_vec2 size, int is_clicked) zr_flags flags, struct zr_vec2 size, struct zr_rect trigger_bounds)
{ {
int ret; int ret;
int is_active = 0; int is_active = 0;
int is_open = 0; int is_open = 0;
int is_clicked = 0;
struct zr_window *win; struct zr_window *win;
struct zr_window *popup; struct zr_window *popup;
@ -9829,11 +9844,15 @@ zr_contextual_begin(struct zr_context *ctx, struct zr_layout *layout,
ZR_ASSERT(ctx->current->layout); ZR_ASSERT(ctx->current->layout);
if (!ctx || !ctx->current || !ctx->current->layout) return 0; if (!ctx || !ctx->current || !ctx->current->layout) return 0;
win = ctx->current; win = ctx->current;
++win->popup.con_count;
popup = win->popup.win; popup = win->popup.win;
is_open = (popup && (popup->flags & ZR_WINDOW_CONTEXTUAL) && win->popup.type == ZR_WINDOW_CONTEXTUAL); is_open = (popup && (popup->flags & ZR_WINDOW_CONTEXTUAL) && win->popup.type == ZR_WINDOW_CONTEXTUAL);
is_clicked = zr_input_mouse_clicked(&ctx->input, ZR_BUTTON_RIGHT, trigger_bounds);
if (win->popup.active_con && win->popup.con_count != win->popup.active_con) return 0;
if ((is_clicked && is_open && !is_active) || (!is_open && !is_active && !is_clicked)) return 0; if ((is_clicked && is_open && !is_active) || (!is_open && !is_active && !is_clicked)) return 0;
win->popup.active_con = win->popup.con_count;
if (is_clicked) { if (is_clicked) {
body.x = ctx->input.mouse.pos.x; body.x = ctx->input.mouse.pos.x;
body.y = ctx->input.mouse.pos.y; body.y = ctx->input.mouse.pos.y;
@ -9846,6 +9865,10 @@ zr_contextual_begin(struct zr_context *ctx, struct zr_layout *layout,
body.h = size.y; body.h = size.y;
ret = zr_nonblock_begin(layout, ctx, flags|ZR_WINDOW_CONTEXTUAL|ZR_WINDOW_NO_SCROLLBAR, body, null_rect); ret = zr_nonblock_begin(layout, ctx, flags|ZR_WINDOW_CONTEXTUAL|ZR_WINDOW_NO_SCROLLBAR, body, null_rect);
if (ret) win->popup.type = ZR_WINDOW_CONTEXTUAL; if (ret) win->popup.type = ZR_WINDOW_CONTEXTUAL;
else {
win->popup.active_con = 0;
win->popup.win->flags = 0;
}
return ret; return ret;
} }

2
zahnrad.h
View File

@ -1479,7 +1479,7 @@ void zr_combo_end(struct zr_context*);
/* contextual menu */ /* contextual menu */
int zr_contextual_begin(struct zr_context*, struct zr_layout*, zr_flags flags, int zr_contextual_begin(struct zr_context*, struct zr_layout*, zr_flags flags,
struct zr_vec2 size, int is_clicked); struct zr_vec2 size, struct zr_rect trigger_bounds);
int zr_contextual_item(struct zr_context*, const char*, enum zr_text_align align); int zr_contextual_item(struct zr_context*, const char*, enum zr_text_align align);
int zr_contextual_item_icon(struct zr_context*, struct zr_image, const char*, enum zr_text_align); int zr_contextual_item_icon(struct zr_context*, struct zr_image, const char*, enum zr_text_align);
int zr_contextual_item_symbol(struct zr_context*, enum zr_symbol, const char*, enum zr_text_align); int zr_contextual_item_symbol(struct zr_context*, enum zr_symbol, const char*, enum zr_text_align);