X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg_settings_menu.h;h=7198810bb9c1324cc1a37f5af6c557067cfd33fe;hb=1c305409e8eca9cf8449d681df73208956ce14df;hp=f84fcf127112df98b4ae586dd57ae73c5c829b91;hpb=8de494d7ddde2e3ce29b43366850320d08a481c4;p=vg.git diff --git a/vg_settings_menu.h b/vg_settings_menu.h index f84fcf1..7198810 100644 --- a/vg_settings_menu.h +++ b/vg_settings_menu.h @@ -49,8 +49,6 @@ struct { } vsync, quality, screenmode, audio_devices, dsp; i32 temp_audio_choice; - - int windowed_before[4]; } static vg_settings = { .fps_limit = { .label = "Fps Limit", @@ -198,12 +196,6 @@ static void vg_settings_video_apply(void){ vg.screen_mode = vg_settings.screenmode.new_value; if( (vg.screen_mode == 0) || (vg.screen_mode == 1) ){ - SDL_GetWindowPosition( vg.window, - &vg_settings.windowed_before[0], - &vg_settings.windowed_before[1] ); - vg_settings.windowed_before[2] = vg.window_x; - vg_settings.windowed_before[3] = vg.window_y; - SDL_DisplayMode video_mode; if( SDL_GetDesktopDisplayMode( 0, &video_mode ) ){ vg_error("SDL_GetDesktopDisplayMode failed: %s\n", SDL_GetError()); @@ -213,7 +205,6 @@ static void vg_settings_video_apply(void){ vg.window_x = video_mode.w; vg.window_y = video_mode.h; } - SDL_SetWindowResizable( vg.window, SDL_FALSE ); SDL_SetWindowSize( vg.window, vg.window_x, vg.window_y ); } @@ -223,13 +214,10 @@ static void vg_settings_video_apply(void){ SDL_SetWindowFullscreen( vg.window, SDL_WINDOW_FULLSCREEN ); if( vg.screen_mode == 2 ){ SDL_SetWindowFullscreen( vg.window, 0 ); - SDL_SetWindowSize( vg.window, - vg_settings.windowed_before[2], - vg_settings.windowed_before[3] ); - SDL_SetWindowPosition( vg.window, - vg_settings.windowed_before[0], - vg_settings.windowed_before[1] ); - SDL_SetWindowResizable( vg.window, SDL_TRUE ); + SDL_SetWindowSize( vg.window, 1280, 720 ); + SDL_SetWindowPosition( vg.window, 16, 16 ); + SDL_SetWindowMinimumSize( vg.window, 1280, 720 ); + SDL_SetWindowMaximumSize( vg.window, 4096, 4096 ); } }