libgui|Font|RichFormat: Revised interpretation of tab stops

Each range in the rich format is assigned a tab stop number.
skyjake · Jun 8, 2013 · d24024f · d24024f
1 parent 7c6a65e
commit d24024f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/doomsday/libgui/include/de/gui/font.h b/doomsday/libgui/include/de/gui/font.h
@@ -91,10 +91,6 @@ class LIBGUI_PUBLIC Font
             AccentColor    = 3,
             DimAccentColor = 4
         };
-        enum {
-            NoTabStop      = -2,
-            NextTabStop    = -1
-        };
 
         /**
          * Interface for an object providing style information: fonts and

diff --git a/doomsday/libgui/src/font.cpp b/doomsday/libgui/src/font.cpp
@@ -48,7 +48,7 @@ struct Font::RichFormat::Instance
 
         Format() : sizeFactor(1.f), weight(OriginalWeight),
             style(OriginalStyle), colorIndex(-1), markIndent(false),
-            tabStop(NoTabStop) {}
+            tabStop(0) {}
     };
 
     struct FormatRange
@@ -89,7 +89,6 @@ struct Font::RichFormat::Instance
 
         // Single range properties.
         stack.last().markIndent = false;
-        stack.last().tabStop = NoTabStop;
     }
 
     void handleEscapeSequence(Rangei const &range)
@@ -126,11 +125,11 @@ struct Font::RichFormat::Instance
             break;
 
         case '\t':
-            stack.last().tabStop = NextTabStop;
+            stack.last().tabStop++;
             break;
 
         case 'T':
-            stack.last().tabStop = code[1].toLatin1() - 'a';
+            stack.last().tabStop = de::max(0, code[1].toLatin1() - 'a');
             break;
 
         case 'b':