X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Flabel.cc;h=8ec03dd9b805b361408d57d306c1983e3864fd99;hb=60cbb9ee92058b7d52bf2a4542c64c7858b00cdd;hp=43d06f77aa6e8b0ad5e2ee1951ba51e976c200b3;hpb=c26e5ea7519b02d7b83261faefeec657bb65c4a4;p=chaz%2Fopenbox

diff --git a/otk/label.cc b/otk/label.cc
index 43d06f77..8ec03dd9 100644
--- a/otk/label.cc
+++ b/otk/label.cc
@@ -10,9 +10,21 @@
 
 namespace otk {
 
+Label::Label(int screen, EventDispatcher *ed, int bevel)
+  : Widget(screen, ed, Widget::Horizontal, bevel, true),
+    _text(""),
+    _font(0),
+    _justify_horz(RenderStyle::LeftTopJustify),
+    _justify_vert(RenderStyle::LeftTopJustify),
+    _highlight(false)
+{
+  styleChanged(*RenderStyle::style(screen));
+}
+
 Label::Label(Widget *parent)
   : Widget(parent),
     _text(""),
+    _font(0),
     _justify_horz(RenderStyle::LeftTopJustify),
     _justify_vert(RenderStyle::LeftTopJustify),
     _highlight(false)
@@ -55,7 +67,14 @@ void Label::setText(const ustring &text)
   std::string::size_type p = 0;
   while (p != std::string::npos) {
     std::string::size_type p2 = s.find('\n', p);
-    _parsedtext.push_back(s.substr(p, (p2==std::string::npos?p2:p2-p)));
+    std::string s(s.substr(p, (p2==std::string::npos?p2:p2-p)));
+
+    // turn tabs into spaces (multiples of 8)
+    std::string::size_type t;
+    while ((t = s.find('\t')) != std::string::npos)
+      s.replace(t, 1, std::string(8 - t % 8, ' '));
+
+    _parsedtext.push_back(s);
     _parsedtext.back().setUtf8(utf);
     p = (p2==std::string::npos?p2:p2+1);
   }