Project

General

Profile

Download (2.57 KB)

Bug #2157 » 0032-gtk-Drop-unused-bottom_hpaned.patch

S3_3, S3_2 - Marko Lindqvist, 08/22/2026 04:01 AM

View differences:

client/gui-gtk-3.22/gui_main.c
GtkWidget *top_vbox;
GtkWidget *top_notebook, *bottom_notebook, *right_notebook;
GtkWidget *map_widget;
static GtkWidget *bottom_hpaned;
PangoFontDescription *city_names_style = NULL;
PangoFontDescription *city_productions_style = NULL;
......
/* *** The message window -- this is a detachable widget *** */
if (GUI_GTK_OPTION(message_chat_location) == GUI_GTK_MSGCHAT_MERGED) {
bottom_hpaned = paned;
right_notebook = bottom_notebook = top_notebook;
} else {
GtkWidget *hpaned;
......
}
gtk_container_add(GTK_CONTAINER(vgrid), hpaned);
g_object_set(hpaned, "margin", 4, NULL);
bottom_hpaned = hpaned;
bottom_notebook = gtk_notebook_new();
gtk_notebook_set_tab_pos(GTK_NOTEBOOK(bottom_notebook), GTK_POS_TOP);
client/gui-gtk-4.0/gui_main.c
GtkWidget *top_vbox;
GtkWidget *top_notebook, *bottom_notebook, *right_notebook;
GtkWidget *map_widget;
static GtkWidget *bottom_hpaned;
PangoFontDescription *city_names_style = NULL;
PangoFontDescription *city_productions_style = NULL;
......
/* *** The message window -- this is a detachable widget *** */
if (GUI_GTK_OPTION(message_chat_location) == GUI_GTK_MSGCHAT_MERGED) {
bottom_hpaned = paned;
right_notebook = bottom_notebook = top_notebook;
} else {
GtkWidget *hpaned;
......
gtk_widget_set_margin_end(hpaned, 4);
gtk_widget_set_margin_start(hpaned, 4);
gtk_widget_set_margin_top(hpaned, 4);
bottom_hpaned = hpaned;
bottom_notebook = gtk_notebook_new();
gtk_notebook_set_tab_pos(GTK_NOTEBOOK(bottom_notebook), GTK_POS_TOP);
(2-2/2)