Changeset 5982 for branches/newosd

Timestamp:

01/03/08 02:13:42 (11 months ago)

Author:

eugene

Message:

Implemented max lines limit.

Files:

• branches/newosd/src/iface.cpp (modified) (2 diffs)

branches/newosd/src/iface.cpp

@@ -200 +200 @@
 void Iface::displayLayout(string& msg, bool control)
 {
+  trd.fore.color = control ? conf->textControlColor : conf->textColor;
+
   pango_layout_set_text(trd.lay, const_cast<char*>(msg.c_str()), -1);
 
-  trd.fore.color = control ? conf->textControlColor : conf->textColor;
+  if (conf->maxLines != 0 &&
+      pango_layout_get_line_count(trd.lay) > conf->maxLines)
+  {
+    PangoLayoutLine* line =
+      pango_layout_get_line_readonly(trd.lay, conf->maxLines);
+    pango_layout_set_text(trd.lay, const_cast<char*>(msg.c_str()),
+        line->start_index);
+  }
 
   unsigned width, height;
@@ -212 +221 @@
       width, height, conf->offsetHorizontal, conf->offsetVertical);
 
+  // TODO implement non-waiting mechanism
+
   aosd_flash(aosd, conf->fadeIn,
       conf->fadeFull + msg.size() * conf->delayPerChar, conf->fadeOut);