X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ffocuslabel.cc;h=846d035ebb78de0317161796e1009535b505db32;hb=59ef3022a4ce0a23e6d54f7d73a2aa77721e9cc9;hp=e75a1d33aa6d3fa5cede0c974cd12a208e03f5c8;hpb=1d897f432e54400cb2a0e1499712782b336fd728;p=chaz%2Fopenbox

diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc
index e75a1d33..846d035e 100644
--- a/otk/focuslabel.cc
+++ b/otk/focuslabel.cc
@@ -5,62 +5,106 @@
 #endif
 
 #include "focuslabel.hh"
+#include "display.hh"
+#include "screeninfo.hh"
 
 namespace otk {
 
-OtkFocusLabel::OtkFocusLabel(OtkWidget *parent)
-  : OtkFocusWidget(parent), _text("")
+FocusLabel::FocusLabel(Widget *parent)
+  : FocusWidget(parent), _text("")
 {
-  setTexture(getStyle()->getLabelFocus());
-  setUnfocusTexture(getStyle()->getLabelUnfocus());
+  setStyle(_style);
 }
 
-OtkFocusLabel::~OtkFocusLabel()
+FocusLabel::~FocusLabel()
 {
 }
 
-void OtkFocusLabel::update(void)
+
+void FocusLabel::setStyle(RenderStyle *style)
+{
+  FocusWidget::setStyle(style);
+
+  setTexture(style->labelFocusBackground());
+  setUnfocusTexture(style->labelUnfocusBackground());
+}
+
+void FocusLabel::fitString(const std::string &str)
+{
+  const Font *ft = style()->labelFont();
+  fitSize(ft->measureString(str), ft->height());
+}
+
+void FocusLabel::fitSize(int w, int h)
+{
+  unsigned int sidemargin = _bevel_width * 2;
+  resize(w + sidemargin * 2, h + _bevel_width * 2);
+}
+
+void FocusLabel::update()
 {
   if (_dirty) {
-    const BFont &ft = getStyle()->getFont();
-    BColor *text_color = (isFocused() ? getStyle()->getTextFocus()
-                          : getStyle()->getTextUnfocus());
-    unsigned int bevel = getStyle()->getBevelWidth();
-
-    std::string t = _text; // the actual text to draw
-    int x = bevel;         // x coord for the text
-
-    // find a string that will fit inside the area for text
-    int max_length = width() - getBevelWidth() * 2;
-    if (max_length <= 0) {
-      t = ""; // can't fit anything
-    } else {
-      size_t text_len = t.size();
-      int length;
+    int w = _rect.width(), h = _rect.height();
+    const Font *ft = style()->labelFont();
+    unsigned int sidemargin = _bevel_width * 2;
+    if (!_fixed_width)
+      w = ft->measureString(_text) + sidemargin * 2;
+    if (!_fixed_height)
+      h = ft->height();
+
+    // enforce a minimum size
+    if (w > _rect.width()) {
+      if (h > _rect.height())
+        internalResize(w, h);
+      else
+        internalResize(w, _rect.height());
+    } else if (h > _rect.height())
+      internalResize(_rect.width(), h);
+  }
+  FocusWidget::update();
+}
+
+
+void FocusLabel::renderForeground()
+{
+  FocusWidget::renderForeground();
+
+  const Font *ft = style()->labelFont();
+  RenderColor *text_color = (isFocused() ? style()->textFocusColor()
+                             : style()->textUnfocusColor());
+  unsigned int sidemargin = _bevel_width * 2;
+
+  ustring t = _text; // the actual text to draw
+  int x = sidemargin;    // x coord for the text
+
+  // find a string that will fit inside the area for text
+  int max_length = width() - sidemargin * 2;
+  if (max_length <= 0) {
+    t = ""; // can't fit anything
+  } else {
+    size_t text_len = t.size();
+    int length;
       
-      do {
-        t.resize(text_len);
-        length = ft.measureString(t);
-      } while (length > max_length && text_len-- > 0);
-
-      // justify the text
-      switch (getStyle()->textJustify()) {
-      case Style::RightJustify:
-        x += max_length - length;
-        break;
-      case Style::CenterJustify:
-        x += (max_length - length) / 2;
-        break;
-      case Style::LeftJustify:
-        break;
-      }
-    }
+    do {
+      t.resize(text_len);
+      length = ft->measureString(t);
+    } while (length > max_length && text_len-- > 0);
 
-    OtkFocusWidget::update();
+    // justify the text
+    switch (style()->labelTextJustify()) {
+    case RenderStyle::RightJustify:
+      x += max_length - length;
+      break;
+    case RenderStyle::CenterJustify:
+      x += (max_length - length) / 2;
+      break;
+    case RenderStyle::LeftJustify:
+      break;
+    }
+  }
 
-    ft.drawString(getWindow(), x, bevel, *text_color, t);
-  } else
-    OtkFocusWidget::update();
+  display->renderControl(_screen)->
+    drawString(*_surface, *ft, x, _bevel_width, *text_color, t);
 }
 
 }