diff options
author | Simon Howard | 2011-01-31 01:25:47 +0000 |
---|---|---|
committer | Simon Howard | 2011-01-31 01:25:47 +0000 |
commit | 83fb03a0e09920ec324734e9ae3a6cd15fb041e7 (patch) | |
tree | 34bdf3901a771e2bff3ece5946acd44303667e7d /setup/display.c | |
parent | afb3bd1405e8c9543be4c1db529c9c8f84c6bd69 (diff) | |
download | chocolate-doom-83fb03a0e09920ec324734e9ae3a6cd15fb041e7.tar.gz chocolate-doom-83fb03a0e09920ec324734e9ae3a6cd15fb041e7.tar.bz2 chocolate-doom-83fb03a0e09920ec324734e9ae3a6cd15fb041e7.zip |
When large numbers of screen resolutions are detected, increase the
number of columns in the mode list to fit them all on-screen. Remove
superfluous left-side spacing from the checkbox and radio button widgets
so that the modes can be packed closer together.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2242
Diffstat (limited to 'setup/display.c')
-rw-r--r-- | setup/display.c | 42 |
1 files changed, 37 insertions, 5 deletions
diff --git a/setup/display.c b/setup/display.c index ca22824c..f4a82520 100644 --- a/setup/display.c +++ b/setup/display.c @@ -89,6 +89,7 @@ static screen_mode_t screen_modes_scaled[] = // List of fullscreen modes generated at runtime static screen_mode_t *screen_modes_fullscreen = NULL; +static int num_screen_modes_fullscreen; static int vidmode = 0; @@ -403,6 +404,8 @@ static void BuildFullscreenModesList(void) memcpy(m1, m2, sizeof(screen_mode_t)); memcpy(m2, &m, sizeof(screen_mode_t)); } + + num_screen_modes_fullscreen = num_modes; } static int FindBestMode(screen_mode_t *modes) @@ -469,7 +472,7 @@ static void GenerateModesTable(TXT_UNCAST_ARG(widget), // Build the table TXT_ClearTable(modes_table); - TXT_SetColumnWidths(modes_table, 15, 15, 15); + TXT_SetColumnWidths(modes_table, 14, 14, 14, 14, 14); for (i=0; modes[i].w != 0; ++i) { @@ -573,6 +576,8 @@ void ConfigDisplay(void) txt_checkbox_t *fs_checkbox; txt_checkbox_t *ar_checkbox; txt_dropdown_list_t *bpp_selector; + int num_columns; + int window_y; // What color depths are supported? Generate supported_bpps array // and set selected_bpp to match the current value of screen_bpp. @@ -592,16 +597,43 @@ void ConfigDisplay(void) window = TXT_NewWindow("Display Configuration"); - TXT_SetWindowPosition(window, TXT_HORIZ_CENTER, TXT_VERT_TOP, - TXT_SCREEN_W / 2, 5); - TXT_AddWidgets(window, fs_checkbox = TXT_NewCheckBox("Fullscreen", &fullscreen), ar_checkbox = TXT_NewCheckBox("Correct aspect ratio", &aspect_ratio_correct), NULL); - modes_table = TXT_NewTable(3); + // Some machines can have lots of video modes. This tries to + // keep a limit of six lines by increasing the number of + // columns. In extreme cases, the window is moved up slightly. + + BuildFullscreenModesList(); + + window_y = 5; + + if (num_screen_modes_fullscreen <= 18) + { + num_columns = 3; + } + else if (num_screen_modes_fullscreen <= 24) + { + num_columns = 4; + } + else + { + num_columns = 5; + window_y -= 3; + } + + modes_table = TXT_NewTable(num_columns); + + // The window is set at a fixed vertical position. This keeps + // the top of the window stationary when switching between + // fullscreen and windowed mode (which causes the window's + // height to change). + + TXT_SetWindowPosition(window, TXT_HORIZ_CENTER, TXT_VERT_TOP, + TXT_SCREEN_W / 2, window_y); // On Windows, there is an extra control to change between // the Windows GDI and DirectX video drivers. |