zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-28 06:53:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- set resolution selector to auto detected resolution at startup, remove the entries from the config file

Browse source 
- committing a change for fullscreen sets scaling to 1.0 to guarantee the selected number of pixels are actually used
This commit is contained in:
Rachael Alexanderson 2019-01-20 02:45:35 -05:00 committed by Christoph Oelckers
parent 057b746e58
commit 45d94ee993
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/menu/resolutionmenu.cpp
View file

@ -39,8 +39,8 @@
#include "v_video.h" #include "v_video.h"
#include "menu/menu.h" #include "menu/menu.h"
CVAR(Int, menu_resolution_custom_width, 640, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) CVAR(Int, menu_resolution_custom_width, 640, 0)
CVAR(Int, menu_resolution_custom_height, 480, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) CVAR(Int, menu_resolution_custom_height, 480, 0)
EXTERN_CVAR(Bool, fullscreen) EXTERN_CVAR(Bool, fullscreen)
EXTERN_CVAR(Bool, win_maximized) EXTERN_CVAR(Bool, win_maximized)
@ -84,6 +84,7 @@ CCMD (menu_resolution_commit_changes)
{ {
fullscreen = true; fullscreen = true;
vid_scalemode = 5; vid_scalemode = 5;
vid_scalefactor = 1.;
vid_scale_customwidth = menu_resolution_custom_width; vid_scale_customwidth = menu_resolution_custom_width;
vid_scale_customheight = menu_resolution_custom_height; vid_scale_customheight = menu_resolution_custom_height;
vid_scale_customstretched = false; vid_scale_customstretched = false;

6
src/v_video.cpp
View file

@ -68,6 +68,8 @@
#include "version.h" #include "version.h"
EXTERN_CVAR(Bool, cl_capfps) EXTERN_CVAR(Bool, cl_capfps)
EXTERN_CVAR(Int, menu_resolution_custom_width)
EXTERN_CVAR(Int, menu_resolution_custom_height)
CVAR(Int, win_x, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) CVAR(Int, win_x, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
CVAR(Int, win_y, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) CVAR(Int, win_y, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
@ -740,6 +742,10 @@ void V_Init2()
Video->SetResolution(); // this only fails via exceptions. Video->SetResolution(); // this only fails via exceptions.
Printf ("Resolution: %d x %d\n", SCREENWIDTH, SCREENHEIGHT); Printf ("Resolution: %d x %d\n", SCREENWIDTH, SCREENHEIGHT);
// init these for the scaling menu
menu_resolution_custom_width = SCREENWIDTH;
menu_resolution_custom_height = SCREENHEIGHT;
screen->SetGamma (); screen->SetGamma ();
FBaseCVar::ResetColors (); FBaseCVar::ResetColors ();
C_NewModeAdjust(); C_NewModeAdjust();