X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Flabel.cc;h=ceb6a49cc2a9cf7c082f585741f7d8b34d73deb8;hb=9e0ae7ecee94a0cc467d90926428fdc84f9a0339;hp=170974ac2d2c449ef072362cfdf06e7686db5092;hpb=26adc8853bc04f3f2f2d2e5f5ac94121f23b72e2;p=chaz%2Fopenbox diff --git a/otk/label.cc b/otk/label.cc index 170974ac..ceb6a49c 100644 --- a/otk/label.cc +++ b/otk/label.cc @@ -14,8 +14,6 @@ OtkLabel::OtkLabel(OtkWidget *parent) const ScreenInfo *info = OBDisplay::screenInfo(getScreen()); _xftdraw = XftDrawCreate(OBDisplay::display, getWindow(), info->getVisual(), info->getColormap()); - - setStyle(getStyle()); } OtkLabel::~OtkLabel() @@ -35,13 +33,13 @@ void OtkLabel::update(void) { if (_dirty) { const BFont &ft = getStyle()->getFont(); - unsigned int bevel = getStyle()->getBevelWidth() / 2; + unsigned int sidemargin = getStyle()->getBevelWidth() * 2; std::string t = _text; // the actual text to draw - int x = bevel; // x coord for the text + int x = sidemargin; // x coord for the text // find a string that will fit inside the area for text - int max_length = width() - bevel * 2; + int max_length = width() - sidemargin * 2; if (max_length <= 0) { t = ""; // can't fit anything } else { @@ -68,7 +66,7 @@ void OtkLabel::update(void) OtkWidget::update(); - ft.drawString(_xftdraw, x, bevel, *getStyle()->getTextUnfocus(), t); + ft.drawString(_xftdraw, x, 0, *getStyle()->getTextUnfocus(), t); } else OtkWidget::update(); }