diff --git a/basegraph.cpp b/basegraph.cpp index b85ead1d..126ade1b 100644 --- a/basegraph.cpp +++ b/basegraph.cpp @@ -1169,6 +1169,12 @@ EX pair get_requested_resolution() { EX bool resizable = true; +EX void setvideomode_android() { + vid.usingGL = vid.wantGL; + vid.full = vid.want_fullscreen; + vid.antialias = vid.want_antialias; + } + #if CAP_SDL EX int current_window_flags = -1; @@ -1355,7 +1361,6 @@ EX void init_graph() { printf("Failed to initialize video.\n"); exit(2); } - graphics_on = true; #if ISWEB get_canvas_size(); @@ -1378,7 +1383,13 @@ EX void init_graph() { SDL_WM_SetCaption(CUSTOM_CAPTION, CUSTOM_CAPTION); #endif #endif - + + graphics_on = true; + +#if ISANDROID + setvideomode_android(); +#endif + #if CAP_SDL setvideomode(); if(!s) { diff --git a/config.cpp b/config.cpp index 311197b3..3834105c 100644 --- a/config.cpp +++ b/config.cpp @@ -1541,10 +1541,11 @@ EX void showGraphConfig() { gamescreen(0); dialog::init(XLAT("graphics configuration")); - + #if !ISIOS && !ISWEB add_edit(vid.want_fullscreen); + #if !ISANDROID && !ISFAKEMOBILE if(vid.want_fullscreen) { add_edit(vid.change_fullscr); if(vid.change_fullscr) @@ -1558,13 +1559,15 @@ EX void showGraphConfig() { add_edit(vid.window_rel_x), add_edit(vid.window_rel_y); else add_edit(vid.window_x), add_edit(vid.window_y); - } + } + #endif #endif #if CAP_GLORNOT add_edit(vid.wantGL); #endif + #if !ISIOS && !ISANDROID && !ISFAKEMOBILE if(!vid.usingGL) { dialog::addBoolItem(XLAT("anti-aliasing"), vid.want_antialias & AA_NOGL, 'O'); dialog::add_action([] { @@ -1589,7 +1592,9 @@ EX void showGraphConfig() { vid.want_antialias |= AA_LINES; }); } + #endif + #if !ISIOS && !ISANDROID && !ISFAKEMOBILE if(vid.usingGL) { if(vrhr::active()) dialog::addInfo(XLAT("(vsync disabled in VR)")); @@ -1598,6 +1603,7 @@ EX void showGraphConfig() { } else dialog::addBreak(100); + #endif if(need_to_apply_screen_settings()) { dialog::addItem(XLAT("apply changes"), 'A');