X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftextscroller.cpp;h=74dc0678ea62bc0ff31c9b5a778bdd2ec5e00033;hb=bc94afa271ad5b59dc1c3e122f75b0354913edf8;hp=5cf82dc210f4442295a65c8f0d2f542898fa0003;hpb=f9e0269b9c1c0cbab91c9b85b0c70a579e7cf86d;p=supertux.git

diff --git a/src/textscroller.cpp b/src/textscroller.cpp
index 5cf82dc21..74dc0678e 100644
--- a/src/textscroller.cpp
+++ b/src/textscroller.cpp
@@ -70,7 +70,7 @@ TextScroller::TextScroller(const std::string& filename)
   }
 
   // Split text string lines into a vector
-  lines = InfoBoxLine::split(text, 40);
+  lines = InfoBoxLine::split(text, SCREEN_WIDTH - 2*LEFT_BORDER);
 
   // load background image
   background.reset(new Surface("images/background/" + background_file));
@@ -124,7 +124,7 @@ TextScroller::draw(DrawingContext& context)
 
   float y = SCREEN_HEIGHT - scroll;
   for(size_t i = 0; i < lines.size(); i++) {
-    lines[i]->draw(context, Vector(LEFT_BORDER, y), LAYER_GUI);
+    lines[i]->draw(context, Rect(LEFT_BORDER, y, SCREEN_WIDTH - 2*LEFT_BORDER, y), LAYER_GUI);
     y += lines[i]->get_height();
   }
 
@@ -138,7 +138,7 @@ InfoBox::InfoBox(const std::string& text)
   : firstline(0)
 {
   // Split text string lines into a vector
-  lines = InfoBoxLine::split(text, 23);
+  lines = InfoBoxLine::split(text, 400);
 
   try
   {
@@ -182,7 +182,7 @@ InfoBox::draw(DrawingContext& context)
       break;
     }
 
-    lines[i]->draw(context, Vector(x1, y), LAYER_GUI);
+    lines[i]->draw(context, Rect(x1, y, x1+width, y), LAYER_GUI);
     y += lines[i]->get_height();
   }
 
@@ -225,47 +225,78 @@ InfoBox::pagedown()
 {
 }
 
-InfoBoxLine::InfoBoxLine(char format_char, const std::string& text) : lineType(NORMAL), font(white_text), text(text), image(0)
-{
+namespace {
+Font* get_font_by_format_char(char format_char) {
   switch(format_char)
   {
     case ' ':
-      lineType = SMALL;
-      font = white_small_text;
+      return white_small_text;
       break;
     case '\t':
-      lineType = NORMAL;
-      font = white_text;
+      return white_text;
       break;
     case '-':
-      lineType = HEADING;
-      font = white_big_text;
+      return white_big_text;
       break;
     case '*':
-      lineType = REFERENCE;
-      font = blue_text;
+      return blue_text;
       break;
     case '#':
-      lineType = NORMAL_LEFT;
-      font = white_text;
+      return white_text;
       break;
     case '!':
-      lineType = IMAGE;
-      image = new Surface(text);
+      return 0;
       break;
     default:
+      return 0;
       log_warning << "Unknown format_char: '" << format_char << "'" << std::endl;
       break;
   }
 }
 
+InfoBoxLine::LineType get_linetype_by_format_char(char format_char) {
+  switch(format_char)
+  {
+    case ' ':
+      return InfoBoxLine::SMALL;
+      break;
+    case '\t':
+      return InfoBoxLine::NORMAL;
+      break;
+    case '-':
+      return InfoBoxLine::HEADING;
+      break;
+    case '*':
+      return InfoBoxLine::REFERENCE;
+      break;
+    case '#':
+      return InfoBoxLine::NORMAL_LEFT;
+      break;
+    case '!':
+      return InfoBoxLine::IMAGE;
+      break;
+    default:
+      return InfoBoxLine::SMALL;
+      log_warning << "Unknown format_char: '" << format_char << "'" << std::endl;
+      break;
+  }
+}
+}
+
+InfoBoxLine::InfoBoxLine(char format_char, const std::string& text) : lineType(NORMAL), font(white_text), text(text), image(0)
+{
+  font = get_font_by_format_char(format_char);
+  lineType = get_linetype_by_format_char(format_char);
+  if (lineType == IMAGE) image = new Surface(text);
+}
+
 InfoBoxLine::~InfoBoxLine()
 {
   delete image;
 }
 
 const std::vector<InfoBoxLine*>
-InfoBoxLine::split(const std::string& text, int line_length)
+InfoBoxLine::split(const std::string& text, float width)
 {
   std::vector<InfoBoxLine*> lines;
 
@@ -300,7 +331,10 @@ InfoBoxLine::split(const std::string& text, int line_length)
     // append wrapped parts of line into list
     std::string overflow;
     do {
-      lines.push_back(new InfoBoxLine(format_char, Font::wrap_to_chars(s, line_length, &overflow)));
+      Font* font = get_font_by_format_char(format_char);
+      std::string s2 = s;
+      if (font) s2 = font->wrap_to_width(s2, width, &overflow);
+      lines.push_back(new InfoBoxLine(format_char, s2));
       s = overflow;
     } while (s.length() > 0);
 
@@ -310,17 +344,18 @@ InfoBoxLine::split(const std::string& text, int line_length)
 }
 
 void
-InfoBoxLine::draw(DrawingContext& context, const Vector& position, int layer)
+InfoBoxLine::draw(DrawingContext& context, const Rect& bbox, int layer)
 {
+  Vector position = bbox.p1;
   switch (lineType) {
     case IMAGE:
-      context.draw_surface(image, Vector( (SCREEN_WIDTH - image->get_width()) / 2, position.y), layer);
+      context.draw_surface(image, Vector( (bbox.p1.x + bbox.p2.x - image->get_width()) / 2, position.y), layer);
       break;
     case NORMAL_LEFT:
       context.draw_text(font, text, Vector(position.x, position.y), ALIGN_LEFT, layer);
       break;
     default:
-      context.draw_text(font, text, Vector(SCREEN_WIDTH/2, position.y), ALIGN_CENTER, layer);
+      context.draw_text(font, text, Vector((bbox.p1.x + bbox.p2.x) / 2, position.y), ALIGN_CENTER, layer);
       break;
   }
 }