Author: cazfi
Date: Sat Dec 20 04:38:15 2014
New Revision: 27353
URL: http://svn.gna.org/viewcvs/freeciv?rev=27353&view=rev
Log:
Set minimum height for gtk3-client citydlg present and supported unit lists
even if they are empty.
Reported by Jacob Nevins <jtn>
See bug #20772
Modified:
trunk/client/gui-gtk-3.0/citydlg.c
Modified: trunk/client/gui-gtk-3.0/citydlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/citydlg.c?rev=27353&r1=27352&r2=27353&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/citydlg.c (original)
+++ trunk/client/gui-gtk-3.0/citydlg.c Sat Dec 20 04:38:15 2014
@@ -797,7 +797,7 @@
GtkListStore *production_store;
/* TRANS: Overview tab in city dialog */
const char *tab_title = _("_Overview");
- int unit_height = tileset_tile_height(tileset) * 3 / 2;
+ int unit_height = tileset_unit_height(tileset);
/* main page */
page = gtk_grid_new();
@@ -951,8 +951,6 @@
/* supported units */
sw = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_set_hexpand(sw, TRUE);
- gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(sw),
- unit_height);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
@@ -963,6 +961,7 @@
table = gtk_grid_new();
gtk_grid_set_column_spacing(GTK_GRID(table), 2);
+ gtk_widget_set_size_request(table, -1, unit_height);
gtk_container_add(GTK_CONTAINER(sw), table);
gtk_container_set_focus_hadjustment(GTK_CONTAINER(table),
@@ -976,8 +975,6 @@
/* present units */
sw = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_set_hexpand(sw, TRUE);
- gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(sw),
- unit_height);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
@@ -986,6 +983,7 @@
table = gtk_grid_new();
gtk_grid_set_column_spacing(GTK_GRID(table), 2);
+ gtk_widget_set_size_request(table, -1, unit_height);
gtk_container_add(GTK_CONTAINER(sw), table);
gtk_container_set_focus_hadjustment(GTK_CONTAINER(table),
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
