Author: cazfi
Date: Sun May 7 20:54:05 2017
New Revision: 35445
URL: http://svn.gna.org/viewcvs/freeciv?rev=35445&view=rev
Log:
Fix asserts about top notebook size.
Patch by Bernhard <aldot> and myself
See gna patch #7163
Modified:
branches/S2_6/client/gui-gtk-3.0/gui_main.c
branches/S2_6/client/gui-gtk-3.22/gui_main.c
Modified: branches/S2_6/client/gui-gtk-3.0/gui_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/gui_main.c?rev=35445&r1=35444&r2=35445&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.0/gui_main.c (original)
+++ branches/S2_6/client/gui-gtk-3.0/gui_main.c Sun May 7 20:54:05 2017
@@ -1435,9 +1435,9 @@
gtk_notebook_set_tab_pos(GTK_NOTEBOOK(top_notebook), GTK_POS_BOTTOM);
gtk_notebook_set_scrollable(GTK_NOTEBOOK(top_notebook), TRUE);
-
+
if (gui_options.gui_gtk3_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_options.gui_gtk3_message_chat_location ==
GUI_GTK_MSGCHAT_MERGED) {
right_vbox = gtk_grid_new();
Modified: branches/S2_6/client/gui-gtk-3.22/gui_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.22/gui_main.c?rev=35445&r1=35444&r2=35445&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.22/gui_main.c (original)
+++ branches/S2_6/client/gui-gtk-3.22/gui_main.c Sun May 7 20:54:05 2017
@@ -1437,9 +1437,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
