Author: cazfi
Date: Sun May  7 20:53:50 2017
New Revision: 35443

URL: http://svn.gna.org/viewcvs/freeciv?rev=35443&view=rev
Log:
Fix asserts about top notebook size.

Patch by Bernhard <aldot> and myself

See gna patch #7163

Modified:
    trunk/client/gui-gtk-3.0/gui_main.c
    trunk/client/gui-gtk-3.22/gui_main.c
    trunk/client/gui-gtk-4.0/gui_main.c

Modified: trunk/client/gui-gtk-3.0/gui_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/gui_main.c?rev=35443&r1=35442&r2=35443&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/gui_main.c (original)
+++ trunk/client/gui-gtk-3.0/gui_main.c Sun May  7 20:53:50 2017
@@ -1436,9 +1436,9 @@
   gtk_notebook_set_tab_pos(GTK_NOTEBOOK(top_notebook), GTK_POS_BOTTOM);
   gtk_notebook_set_scrollable(GTK_NOTEBOOK(top_notebook), TRUE);
 
-  
+
   if (GUI_GTK_OPTION(small_display_layout)) {
-    gtk_paned_pack1(GTK_PANED(paned), top_notebook, TRUE, TRUE);
+    gtk_paned_pack1(GTK_PANED(paned), top_notebook, TRUE, FALSE);
   } else if (GUI_GTK_OPTION(message_chat_location) == GUI_GTK_MSGCHAT_MERGED) {
     right_vbox = gtk_grid_new();
 

Modified: trunk/client/gui-gtk-3.22/gui_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.22/gui_main.c?rev=35443&r1=35442&r2=35443&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.22/gui_main.c        (original)
+++ trunk/client/gui-gtk-3.22/gui_main.c        Sun May  7 20:53:50 2017
@@ -1450,9 +1450,9 @@
   gtk_notebook_set_tab_pos(GTK_NOTEBOOK(top_notebook), GTK_POS_BOTTOM);
   gtk_notebook_set_scrollable(GTK_NOTEBOOK(top_notebook), TRUE);
 
-  
+
   if (GUI_GTK_OPTION(small_display_layout)) {
-    gtk_paned_pack1(GTK_PANED(paned), top_notebook, TRUE, TRUE);
+    gtk_paned_pack1(GTK_PANED(paned), top_notebook, TRUE, FALSE);
   } else if (GUI_GTK_OPTION(message_chat_location) == GUI_GTK_MSGCHAT_MERGED) {
     right_vbox = gtk_grid_new();
 

Modified: trunk/client/gui-gtk-4.0/gui_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-4.0/gui_main.c?rev=35443&r1=35442&r2=35443&view=diff
==============================================================================
--- trunk/client/gui-gtk-4.0/gui_main.c (original)
+++ trunk/client/gui-gtk-4.0/gui_main.c Sun May  7 20:53:50 2017
@@ -1453,9 +1453,9 @@
   gtk_notebook_set_tab_pos(GTK_NOTEBOOK(top_notebook), GTK_POS_BOTTOM);
   gtk_notebook_set_scrollable(GTK_NOTEBOOK(top_notebook), TRUE);
 
-  
+
   if (GUI_GTK_OPTION(small_display_layout)) {
-    gtk_paned_pack1(GTK_PANED(paned), top_notebook, TRUE, TRUE);
+    gtk_paned_pack1(GTK_PANED(paned), top_notebook, TRUE, FALSE);
   } else if (GUI_GTK_OPTION(message_chat_location) == GUI_GTK_MSGCHAT_MERGED) {
     right_vbox = gtk_grid_new();
 


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to