X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Flabel.hh;h=1b31ae79a5b91703096c71f80e295f9241bbb095;hb=6a88803b8c42f44a6f09facc20fcb6fe7901a2f3;hp=94ebe0b3bcad15b49bf432079cb6062f0d0f9d10;hpb=74061b4e2d33d7e2101c4edda26cfc2a1294f32b;p=chaz%2Fopenbox

diff --git a/otk/label.hh b/otk/label.hh
index 94ebe0b3..1b31ae79 100644
--- a/otk/label.hh
+++ b/otk/label.hh
@@ -3,30 +3,56 @@
 #define __label_hh
 
 #include "widget.hh"
+#include "ustring.hh"
+#include "renderstyle.hh"
 #include "font.hh"
-#include "userstring.hh"
+
+#include <vector>
 
 namespace otk {
 
 class Label : public Widget {
 
 public:
-
   Label(Widget *parent);
-  ~Label();
+  virtual ~Label();
+
+  inline const ustring& getText(void) const { return _text; }
+  void setText(const ustring &text);
+
+  RenderStyle::Justify horizontalJustify() const { return _justify_horz; }
+  virtual void setHorizontalJustify(RenderStyle::Justify j);
+  RenderStyle::Justify verticalJustify() const { return _justify_vert; }
+  virtual void setVerticalJustify(RenderStyle::Justify j);
 
-  inline const userstring &getText(void) const { return _text; }
-  void setText(const userstring &text) { _text = text; _dirty = true; }
+  const Font *font() const { return _font; }
+  virtual void setFont(const Font *f);
 
-  void update(void);
+  virtual void calcDefaultSizes();
 
-  virtual void setStyle(Style *style);
+  virtual void styleChanged(const RenderStyle &style);
+  
+  virtual void renderForeground(Surface &surface);
 
+protected:
+  //! The color the label will use for rendering its text
+  RenderColor *_forecolor;
+  
 private:
-  //! Object used by Xft to render to the drawable
-  XftDraw *_xftdraw;
-  //! Text displayed in the label
-  userstring _text;
+  //! Text to be displayed in the label
+  ustring _text;
+  //! Text to be displayed, parsed into its separate lines
+  std::vector<ustring> _parsedtext;
+  //! The actual text being shown, may be a subset of _text
+  ustring _drawtext;
+  //! The font the text will be rendered with
+  const Font *_font;
+  //! The horizontal justification used for drawing text
+  RenderStyle::Justify _justify_horz;
+  //! The vertical justification used for drawing text
+  RenderStyle::Justify _justify_vert;
+  //! The drawing offset for the text
+  int _drawx;
 };
 
 }