X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Flabel.cc;h=8c429dba92157bc962b0362c9eefe52369cc3b47;hb=d8d9b42777ace234f3471918e1210062578f8188;hp=bbc8a6b7ae3e04f16f2d6a8105f1eae257f1230f;hpb=723739dafe91a156fef527f3b53a483195695cf1;p=chaz%2Fopenbox diff --git a/otk/label.cc b/otk/label.cc index bbc8a6b7..8c429dba 100644 --- a/otk/label.cc +++ b/otk/label.cc @@ -8,67 +8,60 @@ namespace otk { -OtkLabel::OtkLabel(OtkWidget *parent) - : OtkWidget(parent), _text("") +Label::Label(Widget *parent) + : Widget(parent), _text("") { - const ScreenInfo *info = OBDisplay::screenInfo(screen()); - _xftdraw = XftDrawCreate(OBDisplay::display, window(), info->getVisual(), - info->getColormap()); } -OtkLabel::~OtkLabel() +Label::~Label() { - XftDrawDestroy(_xftdraw); } -void OtkLabel::setStyle(Style *style) +void Label::setStyle(Style *style) { - OtkWidget::setStyle(style); + Widget::setStyle(style); - setTexture(style->getLabelUnfocus()); + // XXX: do this again + //setTexture(style->getLabelUnfocus()); } -void OtkLabel::update(void) +void Label::renderForeground(void) { - if (_dirty) { - const BFont &ft = style()->getFont(); - unsigned int sidemargin = style()->getBevelWidth() * 2; + const Font *ft = style()->getFont(); + unsigned int sidemargin = style()->getBevelWidth() * 2; - std::string t = _text; // the actual text to draw - int x = sidemargin; // x coord for the text + 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; + // 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); + do { + t.resize(text_len); + length = ft->measureString(t); + } while (length > max_length && text_len-- > 0); - // justify the text - switch (style()->textJustify()) { - case Style::RightJustify: - x += max_length - length; - break; - case Style::CenterJustify: - x += (max_length - length) / 2; - break; - case Style::LeftJustify: - break; - } + // justify the text + switch (style()->textJustify()) { + case Style::RightJustify: + x += max_length - length; + break; + case Style::CenterJustify: + x += (max_length - length) / 2; + break; + case Style::LeftJustify: + break; } + } - OtkWidget::update(); - - ft.drawString(_xftdraw, x, 0, *style()->getTextUnfocus(), t); - } else - OtkWidget::update(); + display->renderControl(_screen)-> + drawString(_surface, *ft, x, 0, *style()->getTextUnfocus(), t); } }