commit c7d2322532782e53c968d08ebe361ad412322a83
Author: Jonathan Dowland <jon+github@alcopop.org>
AuthorDate: Wed Apr 6 21:44:30 2016 +0100
Commit: Jonathan Dowland <jon+github@alcopop.org>
CommitDate: Wed Apr 6 21:47:33 2016 +0100
setup: re-arrange display menu options
Put the fullscreen check-box into an "Options" area after
the resolution selection, to further de-emphasis the
relationship or lack thereof between the two.
Remove the redundant code to change the window size label
name.
---
src/setup/display.c | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/src/setup/display.c b/src/setup/display.c
index cfa27074..c135cde3 100644
--- a/src/setup/display.c
+++ b/src/setup/display.c
@@ -208,13 +208,6 @@ static void GenerateModesTable(TXT_UNCAST_ARG(widget),
}
}
-static void UpdateModeSeparator(TXT_UNCAST_ARG(widget),
- TXT_UNCAST_ARG(separator))
-{
- TXT_CAST_ARG(txt_separator_t, separator);
- TXT_SetSeparatorLabel(separator, "Window size");
-}
-
static void AdvancedDisplayConfig(TXT_UNCAST_ARG(widget),
TXT_UNCAST_ARG(modes_table))
{
@@ -266,7 +259,6 @@ void ConfigDisplay(void)
{
txt_window_t *window;
txt_table_t *modes_table;
- txt_separator_t *modes_separator;
txt_window_action_t *advanced_button;
txt_checkbox_t *fs_checkbox;
int num_columns;
@@ -296,18 +288,15 @@ void ConfigDisplay(void)
// Build window:
- TXT_AddWidget(window,
- fs_checkbox = TXT_NewCheckBox("Full screen", &fullscreen));
-
TXT_AddWidgets(window,
- modes_separator = TXT_NewSeparator(""),
+ TXT_NewSeparator("Window size"),
modes_table,
+ TXT_NewSeparator("Options"),
+ fs_checkbox = TXT_NewCheckBox("Full screen", &fullscreen),
NULL);
TXT_SignalConnect(fs_checkbox, "changed",
GenerateModesTable, modes_table);
- TXT_SignalConnect(fs_checkbox, "changed",
- UpdateModeSeparator, modes_separator);
// How many rows high will the configuration window be?
// Need to take into account number of fullscreen modes, and also
@@ -340,7 +329,6 @@ void ConfigDisplay(void)
TXT_SCREEN_W / 2, window_y);
GenerateModesTable(NULL, modes_table);
- UpdateModeSeparator(NULL, modes_separator);
// Button to open "advanced" window.
// Need to pass a pointer to the modes table, as some of the options