nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

no space on teh top or bottom of text..

Browse source
This commit is contained in:
Dana Jansens 2002-12-03 21:32:03 +00:00
parent d8de17b58e
commit ee896d9d66
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
otk/focuslabel.cc
View file

@ -40,13 +40,13 @@ void OtkFocusLabel::update(void)
const BFont &ft = getStyle()->getFont(); const BFont &ft = getStyle()->getFont();
BColor *text_color = (isFocused() ? getStyle()->getTextFocus() BColor *text_color = (isFocused() ? getStyle()->getTextFocus()
: getStyle()->getTextUnfocus()); : getStyle()->getTextUnfocus());
unsigned int bevel = getStyle()->getBevelWidth() / 2; unsigned int sidemargin = getStyle()->getBevelWidth() * 2;
std::string t = _text; // the actual text to draw 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 // 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) { if (max_length <= 0) {
t = ""; // can't fit anything t = ""; // can't fit anything
} else { } else {
@ -73,7 +73,7 @@ void OtkFocusLabel::update(void)
OtkFocusWidget::update(); OtkFocusWidget::update();
ft.drawString(_xftdraw, x, bevel, *text_color, t); ft.drawString(_xftdraw, x, 0, *text_color, t);
} else } else
OtkFocusWidget::update(); OtkFocusWidget::update();
} }

8
otk/label.cc
View file

@ -35,13 +35,13 @@ void OtkLabel::update(void)
{ {
if (_dirty) { if (_dirty) {
const BFont &ft = getStyle()->getFont(); 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 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 // 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) { if (max_length <= 0) {
t = ""; // can't fit anything t = ""; // can't fit anything
} else { } else {
@ -68,7 +68,7 @@ void OtkLabel::update(void)
OtkWidget::update(); OtkWidget::update();
ft.drawString(_xftdraw, x, bevel, *getStyle()->getTextUnfocus(), t); ft.drawString(_xftdraw, x, 0, *getStyle()->getTextUnfocus(), t);
} else } else
OtkWidget::update(); OtkWidget::update();
} }