[Pingus-CVS] r2998 - in branches/pingus_sdl: . src/worldmap

[grumbel at BerliOS]

Author: grumbel
Date: 2007-08-17 22:41:11 +0200 (Fri, 17 Aug 2007)
New Revision: 2998

Modified:
   branches/pingus_sdl/TODO
   branches/pingus_sdl/src/worldmap/manager.cpp
Log:
- a little more flexible GUI layout, foreign languages still break it, but not 
as bad as before

Modified: branches/pingus_sdl/TODO
===================================================================
--- branches/pingus_sdl/TODO    2007-08-17 20:28:25 UTC (rev 2997)
+++ branches/pingus_sdl/TODO    2007-08-17 20:41:11 UTC (rev 2998)
@@ -60,10 +60,6 @@
 
 - remove all the remaining unneeded debuging std::cout's
 
-- forgein languages break many parts of the GUI (font align, mostly worldmap)
-
-- white-line in top-right worldmap button
-
 Nice to Have:
 =============
 

Modified: branches/pingus_sdl/src/worldmap/manager.cpp
===================================================================
--- branches/pingus_sdl/src/worldmap/manager.cpp        2007-08-17 20:28:25 UTC 
(rev 2997)
+++ branches/pingus_sdl/src/worldmap/manager.cpp        2007-08-17 20:41:11 UTC 
(rev 2998)
@@ -104,7 +104,7 @@
 WorldMapManagerCreditsButton::draw (DrawingContext& gc)
 {
   SurfaceButton::draw(gc);
-  gc.print_left(Fonts::chalk_small, (float)(Display::get_width() - 150 + 15), 
2, _("Show Ending?"));
+  gc.print_center(Fonts::chalk_small, (float)(Display::get_width() - 59 - 24), 
2, _("Show Ending?"));
 }
 
 void
@@ -135,7 +135,7 @@
 WorldMapManagerStoryButton::draw (DrawingContext& gc)
 {
   SurfaceButton::draw(gc);
-  gc.print_left(Fonts::chalk_small, 18, 2, _("Show Story?"));
+  gc.print_center(Fonts::chalk_small, 59, 2, _("Show Story?"));
 }
 
 void
@@ -164,7 +164,7 @@
 WorldMapManagerCloseButton::draw (DrawingContext& gc)
 {
   SurfaceButton::draw(gc);
-  gc.print_left(Fonts::chalk_small, 24, (float)Display::get_height() - 25, 
_("Leave?"));
+  gc.print_center(Fonts::chalk_small, 44, (float)Display::get_height() - 25, 
_("Leave?"));
 }
 
 void
@@ -201,8 +201,8 @@
   else
     {
       SurfaceButton::draw(gc);
-      gc.print_right(Fonts::chalk_small,
-                    (float)Display::get_width() - 40,
+      gc.print_center(Fonts::chalk_small,
+                    (float)Display::get_width() - 43 - 22,
                     (float)Display::get_height() - 25,
                     _("Enter?"));
     }