Project

General

Profile

Bug #1875 » 0055-gtk4-x-citydlg-Stop-supported-present-units-icons-sh.patch

main - Marko Lindqvist, 01/18/2026 12:25 PM

View differences:

client/gui-gtk-4.0/citydlg.c
GtkWidget *page, *bottom;
GtkWidget *right, *frame, *table;
GtkWidget *label, *sw, *view, *bar, *production_combo;
GtkWidget *vp;
GtkCellRenderer *rend;
GtkListStore *production_store;
/* TRANS: Overview tab in city dialog */
......
table = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
gtk_widget_set_size_request(table, -1, unit_height);
gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(sw), table);
vp = gtk_viewport_new(NULL, NULL);
gtk_scrollable_set_hscroll_policy(GTK_SCROLLABLE(vp), GTK_SCROLL_NATURAL);
gtk_viewport_set_child(GTK_VIEWPORT(vp), table);
gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(sw), vp);
pdialog->overview.supported_unit_table = table;
unit_node_vector_init(&pdialog->overview.supported_units);
......
table = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
gtk_widget_set_size_request(table, -1, unit_height);
gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(sw), table);
vp = gtk_viewport_new(NULL, NULL);
gtk_scrollable_set_hscroll_policy(GTK_SCROLLABLE(vp), GTK_SCROLL_NATURAL);
gtk_viewport_set_child(GTK_VIEWPORT(vp), table);
gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(sw), vp);
pdialog->overview.present_unit_table = table;
unit_node_vector_init(&pdialog->overview.present_units);
client/gui-gtk-5.0/citydlg.c
{
GtkWidget *page, *bottom;
GtkWidget *right, *frame, *table;
GtkWidget *label, *sw, *view, *bar;
GtkWidget *label, *sw, *view, *bar, *vp;
/* TRANS: Overview tab in city dialog */
const char *tab_title = _("_Overview");
int unit_height = tileset_unit_with_upkeep_height(tileset);
......
table = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
gtk_widget_set_size_request(table, -1, unit_height);
gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(sw), table);
vp = gtk_viewport_new(NULL, NULL);
gtk_scrollable_set_hscroll_policy(GTK_SCROLLABLE(vp), GTK_SCROLL_NATURAL);
gtk_viewport_set_child(GTK_VIEWPORT(vp), table);
gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(sw), vp);
pdialog->overview.supported_unit_table = table;
unit_node_vector_init(&pdialog->overview.supported_units);
......
table = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
gtk_widget_set_size_request(table, -1, unit_height);
gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(sw), table);
vp = gtk_viewport_new(NULL, NULL);
gtk_scrollable_set_hscroll_policy(GTK_SCROLLABLE(vp), GTK_SCROLL_NATURAL);
gtk_viewport_set_child(GTK_VIEWPORT(vp), table);
gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(sw), vp);
pdialog->overview.present_unit_table = table;
unit_node_vector_init(&pdialog->overview.present_units);
(2-2/3)