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

enforce a min size

Browse source
This commit is contained in:
Dana Jansens 2003-02-04 15:07:39 +00:00
parent 9e6b0d5a8d
commit b8735c759a
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
otk/focuslabel.cc
View file

@ -51,7 +51,15 @@ void FocusLabel::update()
w = ft->measureString(_text) + sidemargin * 2; w = ft->measureString(_text) + sidemargin * 2;
if (!_fixed_height) if (!_fixed_height)
h = ft->height(); h = ft->height();
internalResize(w, h);
// enforce a minimum size
if (w > _rect.width()) {
if (h > _rect.height())
internalResize(w, h);
else
internalResize(w, _rect.height());
} else
internalResize(_rect.width(), h);
} }
FocusWidget::update(); FocusWidget::update();
} }

10
otk/label.cc
View file

@ -47,7 +47,15 @@ void Label::update()
w = ft->measureString(_text) + sidemargin * 2; w = ft->measureString(_text) + sidemargin * 2;
if (!_fixed_height) if (!_fixed_height)
h = ft->height(); h = ft->height();
internalResize(w, h);
// enforce a minimum size
if (w > _rect.width()) {
if (h > _rect.height())
internalResize(w, h);
else
internalResize(w, _rect.height());
} else
internalResize(_rect.width(), h);
} }
Widget::update(); Widget::update();
} }