[Pingus-CVS] CVS: Games/Pingus/src/worldmap level_dot.cxx, 1.23, 1.24

[torangan]

Update of /var/lib/cvs/Games/Pingus/src/worldmap
In directory dark:/tmp/cvs-serv4963/worldmap

Modified Files:
        level_dot.cxx 
Log Message:
prevent level name from reaching out of screen


Index: level_dot.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/level_dot.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- level_dot.cxx       24 Apr 2003 15:18:19 -0000      1.23
+++ level_dot.cxx       23 Aug 2003 18:14:33 -0000      1.24
@@ -19,6 +19,7 @@
 
 #include <iostream>
 #include <math.h>
+#include <ClanLib/Display/Font/font.h>
 #include "../input/controller.hxx"
 #include "../input/pointer.hxx"
 #include "../gettext.h"
@@ -146,19 +147,38 @@
     return false;
 }
 
+
 void
 LevelDot::draw_hover(GraphicContext& gc)
 {
+  int pos_correction = 0;
+
   if (accessible())
     {
+      int length = 
Fonts::pingus_small->get_text_width(System::translate(get_plf()->get_levelname()))
 / 2;
+      int realpos = static_cast<int>(gc.world_to_screen(Vector(pos.x, pos.y, 
0)).x);
+      if (realpos - length < 0)
+        pos_correction = realpos - length;
+      else if (realpos + length > gc.get_width())
+        pos_correction = realpos + length - gc.get_width();
+      
       gc.print_center(Fonts::pingus_small,
-                      int(pos.x), int(pos.y - 40),
+                      static_cast<int>(pos.x) - pos_correction,
+                      static_cast<int>(pos.y - 40),
                       System::translate(get_plf()->get_levelname()));
     }
   else
     {
+      int length = Fonts::pingus_small->get_text_width(_("locked")) / 2;
+      int realpos = static_cast<int>(gc.world_to_screen(Vector(pos.x, pos.y, 
0)).x);
+      if (realpos - length < 0)
+        pos_correction = realpos - length;
+      else if (realpos + length > gc.get_width())
+        pos_correction = realpos + length - gc.get_width();
+        
       gc.print_center(Fonts::pingus_small,
-                      int(pos.x), int(pos.y - 30),
+                      static_cast<int>(pos.x) - pos_correction,
+                      static_cast<int>(pos.y - 30),
                       _("locked"));
     }