mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 03:32:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[zr] implement exit, make clics respond even when the window is innactive

Browse Source
This commit is contained in:
radius 2016-03-02 16:23:46 -05:00
parent 7853815d45
commit 55530dcbc3
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deps/zahnrad/zahnrad.c vendored
View File

@ -7743,7 +7743,8 @@ zr_op_begin(struct zr_context *ctx, union zr_param *p, struct zr_event_queue *qu
* For now I activate the window on the next frame to prevent wrong
* behavior. If not wanted just replace line with:
* win->flags &= ~(zr_flags)ZR_WINDOW_ROM; */
win->flags |= ZR_WINDOW_REMOVE_ROM;
win->flags &= ~(zr_flags)ZR_WINDOW_ROM;win->flags &= ~(zr_flags)ZR_WINDOW_ROM;
ctx->active = win;
}
if (ctx->end != win)

11
menu/drivers/zr.c
View File

@ -364,7 +364,7 @@ static void zrmenu_wnd_demo(struct zr_context *ctx, int width, int height, struc
settings_t *settings = config_get_ptr();
struct zr_panel layout;
if (zr_begin(ctx, &layout, "Demo Window", zr_rect(10, 90, 500, 400),
if (zr_begin(ctx, &layout, "Demo Window", zr_rect(140, 90, 500, 400),
ZR_WINDOW_CLOSABLE|ZR_WINDOW_MINIMIZABLE|ZR_WINDOW_MOVABLE|
ZR_WINDOW_SCALABLE|ZR_WINDOW_BORDER))
{
@ -442,12 +442,13 @@ static void zrmenu_wnd_main(struct zr_context *ctx, int width, int height, struc
zr_layout_row_dynamic(ctx, 25, 1);
if (zr_menu_item(ctx, ZR_TEXT_LEFT, "Test"))
printf("test \n");
printf("test \n");
if (zr_menu_item(ctx, ZR_TEXT_LEFT, "About"))
printf("test \n");
printf("test \n");
if (zr_menu_item(ctx, ZR_TEXT_LEFT, "Exit"))
printf("test \n");
zr_menu_end(ctx);
rarch_ctl(RARCH_CTL_FORCE_QUIT, NULL);
zr_menu_end(ctx);
}
if (zr_menu_text_begin(ctx, &menu, "Window", ZR_TEXT_LEFT|ZR_TEXT_MIDDLE, 120))
{