80 cols

[chaz/openbox] / otk / label.hh

diff --git a/otk/label.hh b/otk/label.hh
index 0366c262c7195285abc1b6acc5090c331b061d65..9c32e544936ea0ebc414633814572690eec585e4 100644 (file)
--- a/otk/label.hh
+++ b/otk/label.hh
@@ -3,7 +3,6 @@
 #define __label_hh
 
 #include "widget.hh"
-#include "font.hh"
 
 namespace otk {
 
@@ -14,18 +13,25 @@ public:
   Label(Widget *parent);
   ~Label();
 
-  inline const std::string &getText(void) const { return _text; }
-  void setText(const std::string &text) { _text = text; _dirty = true; }
+  inline const ustring &getText(void) const { return _text; }
+  void setText(const ustring &text) { _text = text; _dirty = true; }
 
-  void update(void);
+  virtual void renderForeground(void);
 
-  virtual void setStyle(Style *style);
+  virtual void update();
+
+  void fitString(const std::string &str);
+  void fitSize(int w, int h);
+
+  virtual void setStyle(RenderStyle *style);
 
 private:
-  //! Object used by Xft to render to the drawable
-  XftDraw *_xftdraw;
-  //! Text displayed in the label
-  std::string _text;
+  //! Text to be displayed in the label
+  ustring _text;
+  //! The actual text being shown, may be a subset of _text
+  ustring _drawtext;
+  //! The drawing offset for the text
+  int _drawx;
 };
 
 }