Author: cazfi
Date: Wed Oct 19 09:53:09 2016
New Revision: 34175
URL: http://svn.gna.org/viewcvs/freeciv?rev=34175&view=rev
Log:
When screen size cannot be queried, assume minimum height instead of
considering it zero,
when deciding size for intro picture.
See patch #7845
Modified:
branches/S2_6/client/gui-gtk-3.0/pages.c
branches/S2_6/client/gui-gtk-3.22/pages.c
Modified: branches/S2_6/client/gui-gtk-3.0/pages.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/pages.c?rev=34175&r1=34174&r2=34175&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.0/pages.c (original)
+++ branches/S2_6/client/gui-gtk-3.0/pages.c Wed Oct 19 09:53:09 2016
@@ -254,6 +254,11 @@
intro_in = load_gfxfile(tileset_main_intro_filename(tileset));
get_sprite_dimensions(intro_in, &width, &height);
sh = screen_height();
+
+ if (sh <= 0) {
+ /* Assume some minimum height */
+ sh = 600;
+ }
space_needed = 250;
#if IS_BETA_VERSION
Modified: branches/S2_6/client/gui-gtk-3.22/pages.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.22/pages.c?rev=34175&r1=34174&r2=34175&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.22/pages.c (original)
+++ branches/S2_6/client/gui-gtk-3.22/pages.c Wed Oct 19 09:53:09 2016
@@ -254,6 +254,11 @@
intro_in = load_gfxfile(tileset_main_intro_filename(tileset));
get_sprite_dimensions(intro_in, &width, &height);
sh = screen_height();
+
+ if (sh <= 0) {
+ /* Assume some minimum height */
+ sh = 600;
+ }
space_needed = 250;
#if IS_BETA_VERSION
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
