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

fixed popup panel blocking

Browse Source
This commit is contained in:
vurtun 2015-08-14 12:58:20 +02:00
parent 8d4b3dca55
commit a582e97326
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
demo/demo.c
View File

@ -621,11 +621,11 @@ run_demo(struct demo_gui *gui)
const gui_char *file_items[] = {"Open", "Close", "Quit"};
const gui_char *edit_items[] = {"Copy", "Cut", "Delete", "Paste"};
gui_panel_row_begin(&layout, GUI_STATIC, 25, 2);
gui_panel_row_push(&layout, config->font.width(config->font.userdata, "_FILE_", 6));
gui_panel_menu(&layout, "FILE", file_items, LEN(file_items), 25, 100,
gui_panel_row_push(&layout, config->font.width(config->font.userdata, "__FILE__", 8));
gui_panel_menu(&layout, "FILE", file_items, LEN(file_items), 20, 100,
&state->file_open, gui_vec2(0,0));
gui_panel_row_push(&layout, config->font.width(config->font.userdata, "_EDIT_", 6));
gui_panel_menu(&layout, "EDIT", edit_items, LEN(edit_items), 25, 100,
gui_panel_row_push(&layout, config->font.width(config->font.userdata, "__EDIT__", 8));
gui_panel_menu(&layout, "EDIT", edit_items, LEN(edit_items), 20, 100,
&state->edit_open, gui_vec2(0,0));
gui_panel_row_end(&layout);
}

4
gui.c
View File

@ -3528,8 +3528,10 @@ gui_panel_end(struct gui_panel_layout *layout, struct gui_panel *panel)
/* panel is visible and not tab */
else gui_command_queue_finish(panel->queue, &panel->buffer);
}
if (layout->flags & GUI_PANEL_REMOVE_ROM)
if (layout->flags & GUI_PANEL_REMOVE_ROM) {
layout->flags &= ~(gui_flags)GUI_PANEL_ROM;
layout->flags &= ~(gui_flags)GUI_PANEL_REMOVE_ROM;
}
panel->flags = layout->flags;
}