namespace otk {
-OtkFocusLabel::OtkFocusLabel(OtkWidget *parent)
- : OtkFocusWidget(parent), _text("")
+FocusLabel::FocusLabel(Widget *parent)
+ : FocusWidget(parent), _text("")
{
- const ScreenInfo *info = OBDisplay::screenInfo(screen());
- _xftdraw = XftDrawCreate(OBDisplay::display, window(), info->getVisual(),
- info->getColormap());
}
-OtkFocusLabel::~OtkFocusLabel()
+FocusLabel::~FocusLabel()
{
- XftDrawDestroy(_xftdraw);
}
-void OtkFocusLabel::setStyle(Style *style)
+void FocusLabel::setStyle(Style *style)
{
- OtkFocusWidget::setStyle(style);
-
- setTexture(style->getLabelFocus());
- setUnfocusTexture(style->getLabelUnfocus());
+ FocusWidget::setStyle(style);
+
+ // XXX: do this again
+ //setTexture(style->getLabelFocus());
+ //setUnfocusTexture(style->getLabelUnfocus());
}
-void OtkFocusLabel::update(void)
+void FocusLabel::renderForeground(void)
{
- if (_dirty) {
- const BFont &ft = style()->getFont();
- BColor *text_color = (isFocused() ? style()->getTextFocus()
- : style()->getTextUnfocus());
- unsigned int sidemargin = style()->getBevelWidth() * 2;
+ const Font *ft = style()->getFont();
+ Color *text_color = (isFocused() ? style()->getTextFocus()
+ : style()->getTextUnfocus());
+ 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;
}
+ }
- OtkFocusWidget::update();
-
- ft.drawString(_xftdraw, x, 0, *text_color, t);
- } else
- OtkFocusWidget::update();
+ display->renderControl(_screen)->
+ drawString(*_surface, *ft, x, 0, *text_color, t);
}
}