Project

General

Profile

Download (7.92 KB)

Feature #1287 » 1287corrected.patch

Dean Brown, 05/20/2025 11:30 PM

View differences:

client/gui-gtk-3.22/helpdlg.c
help_frame = gtk_frame_new("");
gtk_container_add(GTK_CONTAINER(hbox), help_frame);
gtk_widget_set_size_request(help_frame, 520, 350);
gtk_widget_set_size_request(help_frame,
GUI_GTK_OPTION(helpdlg_xsize),
GUI_GTK_OPTION(helpdlg_ysize));
gtk_widget_show(help_frame);
help_box = gtk_grid_new();
......
help_command_update();
}
} else {
/* Save size of the dialog. */
GUI_GTK_OPTION(helpdlg_xsize) = gtk_widget_get_allocated_width(help_frame);
GUI_GTK_OPTION(helpdlg_ysize) = gtk_widget_get_allocated_height(help_frame);
gtk_widget_destroy(help_dialog_shell);
}
}
client/gui-gtk-4.0/helpdlg.c
G_CALLBACK(help_command_callback), NULL);
g_signal_connect(help_dialog_shell, "destroy",
G_CALLBACK(help_destroy_callback), NULL);
gtk_window_set_default_size(GTK_WINDOW(help_dialog_shell),
GUI_GTK_OPTION(helpdlg_xsize),
GUI_GTK_OPTION(helpdlg_ysize));
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_append(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(help_dialog_shell))),
......
help_command_update();
}
} else {
/* Save size of the dialog. */
gtk_window_get_default_size(GTK_WINDOW(help_dialog_shell),
&GUI_GTK_OPTION(helpdlg_xsize),
&GUI_GTK_OPTION(helpdlg_ysize));
gtk_window_destroy(GTK_WINDOW(help_dialog_shell));
}
}
client/options.c
.gui_gtk3_22_chatline_autocompletion = TRUE,
.gui_gtk3_22_citydlg_xsize = GUI_GTK3_22_CITYDLG_DEFAULT_XSIZE,
.gui_gtk3_22_citydlg_ysize = GUI_GTK3_22_CITYDLG_DEFAULT_YSIZE,
.gui_gtk3_22_helpdlg_xsize = GUI_GTK3_22_HELPDLG_DEFAULT_XSIZE,
.gui_gtk3_22_helpdlg_ysize = GUI_GTK3_22_HELPDLG_DEFAULT_YSIZE,
.gui_gtk3_22_popup_tech_help = GUI_POPUP_TECH_HELP_RULESET,
.gui_gtk3_22_governor_range_min = -20,
.gui_gtk3_22_governor_range_max = 20,
......
.gui_gtk4_chatline_autocompletion = TRUE,
.gui_gtk4_citydlg_xsize = GUI_GTK4_CITYDLG_DEFAULT_XSIZE,
.gui_gtk4_citydlg_ysize = GUI_GTK4_CITYDLG_DEFAULT_YSIZE,
.gui_gtk4_helpdlg_xsize = GUI_GTK4_HELPDLG_DEFAULT_XSIZE,
.gui_gtk4_helpdlg_ysize = GUI_GTK4_HELPDLG_DEFAULT_YSIZE,
.gui_gtk4_popup_tech_help = GUI_POPUP_TECH_HELP_RULESET,
.gui_gtk4_governor_range_min = -20,
.gui_gtk4_governor_range_max = 20,
......
COC_INTERFACE, GUI_GTK3_22, GUI_GTK3_22_CITYDLG_DEFAULT_YSIZE,
GUI_GTK3_22_CITYDLG_MIN_YSIZE, GUI_GTK3_22_CITYDLG_MAX_YSIZE,
NULL),
GEN_INT_OPTION(gui_gtk3_22_helpdlg_xsize,
N_("Width of the help dialog"),
NULL,
COC_INTERFACE, GUI_GTK3_22, GUI_GTK3_22_HELPDLG_DEFAULT_XSIZE,
GUI_GTK3_22_HELPDLG_MIN_XSIZE, GUI_GTK3_22_HELPDLG_MAX_XSIZE,
NULL),
GEN_INT_OPTION(gui_gtk3_22_helpdlg_ysize,
N_("Height of the help dialog"),
NULL,
COC_INTERFACE, GUI_GTK3_22, GUI_GTK3_22_HELPDLG_DEFAULT_YSIZE,
GUI_GTK3_22_HELPDLG_MIN_YSIZE, GUI_GTK3_22_HELPDLG_MAX_YSIZE,
NULL),
GEN_ENUM_OPTION(gui_gtk3_22_popup_tech_help,
N_("Popup tech help when gained"),
N_("Controls if tech help should be opened when "
......
COC_INTERFACE, GUI_GTK4, GUI_GTK4_CITYDLG_DEFAULT_YSIZE,
GUI_GTK4_CITYDLG_MIN_YSIZE, GUI_GTK4_CITYDLG_MAX_YSIZE,
NULL),
GEN_INT_OPTION(gui_gtk4_helpdlg_xsize,
N_("Width of the help dialog"),
N_("This value is only used if the width of the help "
"dialog is saved."),
COC_INTERFACE, GUI_GTK4, GUI_GTK4_HELPDLG_DEFAULT_XSIZE,
GUI_GTK4_HELPDLG_MIN_XSIZE, GUI_GTK4_HELPDLG_MAX_XSIZE,
NULL),
GEN_INT_OPTION(gui_gtk4_helpdlg_ysize,
N_("Height of the help dialog"),
N_("This value is only used if the height of the help "
"dialog is saved."),
COC_INTERFACE, GUI_GTK4, GUI_GTK4_HELPDLG_DEFAULT_YSIZE,
GUI_GTK4_HELPDLG_MIN_YSIZE, GUI_GTK4_HELPDLG_MAX_YSIZE,
NULL),
GEN_ENUM_OPTION(gui_gtk4_popup_tech_help,
N_("Popup tech help when gained"),
N_("Controls if tech help should be opened when "
client/options.h
bool gui_gtk3_22_chatline_autocompletion;
int gui_gtk3_22_citydlg_xsize;
int gui_gtk3_22_citydlg_ysize;
int gui_gtk3_22_helpdlg_xsize;
int gui_gtk3_22_helpdlg_ysize;
int gui_gtk3_22_popup_tech_help;
int gui_gtk3_22_governor_range_min;
int gui_gtk3_22_governor_range_max;
......
bool gui_gtk4_chatline_autocompletion;
int gui_gtk4_citydlg_xsize;
int gui_gtk4_citydlg_ysize;
int gui_gtk4_helpdlg_xsize;
int gui_gtk4_helpdlg_ysize;
int gui_gtk4_popup_tech_help;
int gui_gtk4_governor_range_min;
int gui_gtk4_governor_range_max;
......
#define GUI_GTK3_22_CITYDLG_MIN_YSIZE 128
#define GUI_GTK3_22_CITYDLG_MAX_YSIZE 4096
/* gui-gtk3.22: [xy]size of the help dialog */
#define GUI_GTK3_22_HELPDLG_DEFAULT_XSIZE 770
#define GUI_GTK3_22_HELPDLG_MIN_XSIZE 256
#define GUI_GTK3_22_HELPDLG_MAX_XSIZE 4096
#define GUI_GTK3_22_HELPDLG_DEFAULT_YSIZE 512
#define GUI_GTK3_22_HELPDLG_MIN_YSIZE 128
#define GUI_GTK3_22_HELPDLG_MAX_YSIZE 4096
#define GUI_GTK3_22_GOV_RANGE_MIN_DEFAULT -20
#define GUI_GTK3_22_GOV_RANGE_MIN_MIN -100
#define GUI_GTK3_22_GOV_RANGE_MIN_MAX 0
......
#define GUI_GTK4_CITYDLG_MIN_YSIZE 128
#define GUI_GTK4_CITYDLG_MAX_YSIZE 4096
/* gui-gtk4.0: [xy]size of the help dialog */
#define GUI_GTK4_HELPDLG_DEFAULT_XSIZE 770
#define GUI_GTK4_HELPDLG_MIN_XSIZE 256
#define GUI_GTK4_HELPDLG_MAX_XSIZE 4096
#define GUI_GTK4_HELPDLG_DEFAULT_YSIZE 512
#define GUI_GTK4_HELPDLG_MIN_YSIZE 128
#define GUI_GTK4_HELPDLG_MAX_YSIZE 4096
#define GUI_GTK4_GOV_RANGE_MIN_DEFAULT -20
#define GUI_GTK4_GOV_RANGE_MIN_MIN -100
#define GUI_GTK4_GOV_RANGE_MIN_MAX 0
(7-7/10)