[Freeciv-Dev] (PR#12090) citydlg too wide

["Vasco Alexandre da Silva Costa" <vasc@xxxxxxxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=12090 >

> [jdorje - Thu Feb 03 20:28:55 2005]:
> 
> The problem is with this savegame.  The minimum size seems to go up with
> city size so the largest city (boston) has the biggest problem.

The happiness pane was too large (the new effects patch made it worse).
This patch reduces the window width here from 1220 pixels to 797 pixels.

Index: client/text.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/text.c,v
retrieving revision 1.22
diff -u -r1.22 text.c
--- client/text.c       2 Feb 2005 02:44:31 -0000       1.22
+++ client/text.c       3 Feb 2005 20:57:14 -0000
@@ -733,15 +733,20 @@
   get_city_bonus_effects(plist, pcity, EFT_MAKE_CONTENT);
 
   effect_list_iterate(plist, peffect) {
-    faces++;
+    if (faces != 0) {
+      add(_(", "));
+    }
     get_effect_req_text(peffect, buf, sizeof(buf));
-    add(_("%s. "), buf);
+    add(_("%s"), buf);
+    faces++;
   } effect_list_iterate_end;
   effect_list_unlink_all(plist);
   effect_list_free(plist);
 
   if (faces == 0) {
     add(_("None. "));
+  } else {
+    add(_("."));
   }
 
   RETURN;
@@ -763,9 +768,12 @@
   get_city_bonus_effects(plist, pcity, EFT_NO_UNHAPPY);
 
   effect_list_iterate(plist, peffect) {
-    faces++;
+    if (faces != 0) {
+      add(_(", "));
+    }
     get_effect_req_text(peffect, buf, sizeof(buf));
-    add(_("%s. "), buf);
+    add(_("%s"), buf);
+    faces++;
   } effect_list_iterate_end;
 
   effect_list_unlink_all(plist);
@@ -773,6 +781,8 @@
 
   if (faces == 0) {
     add(_("None. "));
+  } else {
+    add(_("."));
   }
 
   RETURN;
Index: client/gui-gtk-2.0/happiness.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/happiness.c,v
retrieving revision 1.17
diff -u -r1.17 happiness.c
--- client/gui-gtk-2.0/happiness.c      22 Jan 2005 19:45:40 -0000      1.17
+++ client/gui-gtk-2.0/happiness.c      3 Feb 2005 20:57:14 -0000
@@ -141,8 +141,7 @@
     gtk_misc_set_alignment(GTK_MISC(pdialog->hpixmaps[i]), 0, 0);
     gtk_misc_set_alignment(GTK_MISC(pdialog->hlabels[i]), 0, 0);
     gtk_label_set_justify(GTK_LABEL(pdialog->hlabels[i]), GTK_JUSTIFY_LEFT);
-
-    /* gtk_label_set_line_wrap(GTK_LABEL(pdialog->hlabels[i]), TRUE); */
+    gtk_label_set_line_wrap(GTK_LABEL(pdialog->hlabels[i]), TRUE);
   }
 
   gtk_widget_show_all(pdialog->shell);