otk::ustring t = _client->title(); // the actual text to draw
int x = geom.bevel; // x coord for the text
- if (x * 2 > geom.label_width) return; // no room at all
-
- // find a string that will fit inside the area for text
- otk::ustring::size_type text_len = t.size();
- int length;
- int maxsize = geom.label_width - geom.bevel * 2;
+ if (x * 2 < geom.label_width) {
+ // find a string that will fit inside the area for text
+ otk::ustring::size_type text_len = t.size();
+ int length;
+ int maxsize = geom.label_width - geom.bevel * 2;
- do {
- t.resize(text_len);
- length = font->measureString(t); // this returns an unsigned, so check < 0
- if (length < 0) length = maxsize; // if the string's that long just adjust
- } while (length > maxsize && text_len-- > 0);
-
- if (text_len <= 0) return; // won't fit anything
-
- // justify the text
- switch (style->labelTextJustify()) {
- case otk::RenderStyle::RightBottomJustify:
- x += maxsize - length;
- break;
- case otk::RenderStyle::CenterJustify:
- x += (maxsize - length) / 2;
- break;
- case otk::RenderStyle::LeftTopJustify:
- break;
- }
+ do {
+ t.resize(text_len);
+ length = font->measureString(t);// this returns an unsigned, so check < 0
+ if (length < 0) length = maxsize;// if the string's that long just adjust
+ } while (length > maxsize && text_len-- > 0);
+
+ // justify the text
+ switch (style->labelTextJustify()) {
+ case otk::RenderStyle::RightBottomJustify:
+ x += maxsize - length;
+ break;
+ case otk::RenderStyle::CenterJustify:
+ x += (maxsize - length) / 2;
+ break;
+ case otk::RenderStyle::LeftTopJustify:
+ break;
+ }
- control->drawString(*s, *font, x, 0,
- *(_client->focused() ? style->textFocusColor() :
- style->textUnfocusColor()), t);
+ if (text_len > 0)
+ control->drawString(*s, *font, x, 0,
+ *(_client->focused() ? style->textFocusColor() :
+ style->textUnfocusColor()), t);
+ }
XSetWindowBackgroundPixmap(**otk::display, _label, s->pixmap());
XClearWindow(**otk::display, _label);
const Icon *icon = _client->icon(otk::Size(geom.button_size,
geom.button_size));
control->drawImage(*s, icon->w, icon->h, icon->data);
+ if (!icon->data) {
+ Pixmap p = _client->pixmapIcon(), m = _client->pixmapIconMask();
+ if (p != None)
+ control->drawImage(*s, p, m);
+ }
XSetWindowBackgroundPixmap(**otk::display, _icon, s->pixmap());
XClearWindow(**otk::display, _icon);
geom.icon_x = x;
XMapWindow(**otk::display, _icon);
XMoveWindow(**otk::display, _icon, x, geom.bevel + 1);
- x += geom.button_size;
+ x += geom.button_size + geom.bevel;
break;
case 'd':
case 'D':
if (!d) break;
XMapWindow(**otk::display, _desk);
XMoveWindow(**otk::display, _desk, x, geom.bevel + 1);
- x += geom.button_size;
+ x += geom.button_size + geom.bevel;
break;
case 'i':
case 'I':
if (!i) break;
XMapWindow(**otk::display, _iconify);
XMoveWindow(**otk::display, _iconify, x, geom.bevel + 1);
- x += geom.button_size;
+ x += geom.button_size + geom.bevel;
break;
case 't':
case 'T':
if (!t) break;
XMapWindow(**otk::display, _label);
XMoveWindow(**otk::display, _label, x, geom.bevel);
- x += geom.label_width;
+ x += geom.label_width + geom.bevel;
break;
case 'm':
case 'M':
if (!m) break;
XMapWindow(**otk::display, _max);
XMoveWindow(**otk::display, _max, x, geom.bevel + 1);
- x += geom.button_size;
+ x += geom.button_size + geom.bevel;
break;
case 'c':
case 'C':
if (!c) break;
XMapWindow(**otk::display, _close);
XMoveWindow(**otk::display, _close, x, geom.bevel + 1);
- x += geom.button_size;
+ x += geom.button_size + geom.bevel;
break;
}
- x += geom.bevel;
}
}