From b8735c759a0a638a1169089c310baf9de6414597 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Tue, 4 Feb 2003 15:07:39 +0000 Subject: [PATCH] enforce a min size --- otk/focuslabel.cc | 10 +++++++++- otk/label.cc | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc index 6d7d5c31..8ac328e7 100644 --- a/otk/focuslabel.cc +++ b/otk/focuslabel.cc @@ -51,7 +51,15 @@ void FocusLabel::update() w = ft->measureString(_text) + sidemargin * 2; if (!_fixed_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(); } diff --git a/otk/label.cc b/otk/label.cc index fa5fefff..8352fb7a 100644 --- a/otk/label.cc +++ b/otk/label.cc @@ -47,7 +47,15 @@ void Label::update() w = ft->measureString(_text) + sidemargin * 2; if (!_fixed_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(); } -- 2.45.2