[textlayout] move addition of '\n' for the last line into LineBreakText

xbmc · May 11, 2013 · 2c8c5de · 2c8c5de
1 parent 8e20cfe
commit 2c8c5de
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/xbmc/guilib/GUITextLayout.cpp b/xbmc/guilib/GUITextLayout.cpp
@@ -232,9 +232,6 @@ bool CGUITextLayout::UpdateW(const CStdStringW &text, float maxWidth /*= 0*/, bo
   // parse the text into our string objects
   ParseText(text, parsedText);
 
-  // add \n to the end of the string
-  parsedText.push_back(L'\n');
-
   // if we need to wrap the text, then do so
   if (m_wrap && maxWidth > 0)
     WrapText(parsedText, maxWidth);
@@ -559,6 +556,12 @@ void CGUITextLayout::LineBreakText(const vecText &text, vector<CGUIString> &line
     }
     pos++;
   }
+  // handle the last line if non-empty
+  if (lineStart < text.end() && (nMaxLines <= 0 || lines.size() < (size_t)nMaxLines))
+  {
+    CGUIString string(lineStart, text.end(), true);
+    lines.push_back(string);
+  }
 }
 
 void CGUITextLayout::GetTextExtent(float &width, float &height) const