From afe1d9e3a88610d5d3ae351dd2648aedfd2537b2 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 16 Feb 2003 10:05:29 +0000 Subject: [PATCH] still draw the background when no text will fit --- src/frame.cc | 55 ++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/src/frame.cc b/src/frame.cc index 9e97f2b0..d1c206e7 100644 --- a/src/frame.cc +++ b/src/frame.cc @@ -437,36 +437,35 @@ void Frame::renderLabel() 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); -- 2.45.2