Author: cazfi Date: Sat Oct 22 16:40:18 2016 New Revision: 34206 URL: http://svn.gna.org/viewcvs/freeciv?rev=34206&view=rev Log: Do not use small screen layout for gtk3-clients' citydlg when screen size is unknown.
See patch #7861 Modified: branches/S2_6/client/gui-gtk-3.0/citydlg.c branches/S2_6/client/gui-gtk-3.22/citydlg.c Modified: branches/S2_6/client/gui-gtk-3.0/citydlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/citydlg.c?rev=34206&r1=34205&r2=34206&view=diff ============================================================================== --- branches/S2_6/client/gui-gtk-3.0/citydlg.c (original) +++ branches/S2_6/client/gui-gtk-3.0/citydlg.c Sat Oct 22 16:40:18 2016 @@ -323,11 +323,17 @@ *****************************************************************/ static void initialize_city_dialogs(void) { + int height; + fc_assert_ret(!city_dialogs_have_been_initialised); dialog_list = dialog_list_new(); init_citydlg_dimensions(); - if (screen_height() <= TINYSCREEN_MAX_HEIGHT) { + height = screen_height(); + + /* Use default layout when height cannot be determined + * (when height == 0) */ + if (height > 0 && height <= TINYSCREEN_MAX_HEIGHT) { low_citydlg = TRUE; } else { low_citydlg = FALSE; Modified: branches/S2_6/client/gui-gtk-3.22/citydlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.22/citydlg.c?rev=34206&r1=34205&r2=34206&view=diff ============================================================================== --- branches/S2_6/client/gui-gtk-3.22/citydlg.c (original) +++ branches/S2_6/client/gui-gtk-3.22/citydlg.c Sat Oct 22 16:40:18 2016 @@ -323,11 +323,17 @@ *****************************************************************/ static void initialize_city_dialogs(void) { + int height; + fc_assert_ret(!city_dialogs_have_been_initialised); dialog_list = dialog_list_new(); init_citydlg_dimensions(); - if (screen_height() <= TINYSCREEN_MAX_HEIGHT) { + height = screen_height(); + + /* Use default layout when height cannot be determined + * (when height == 0) */ + if (height > 0 && height <= TINYSCREEN_MAX_HEIGHT) { low_citydlg = TRUE; } else { low_citydlg = FALSE; _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits