From 91337be4652b0f8c822de58d3c646423b1967bf0 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Fri, 11 Jan 2013 20:49:56 +0100 Subject: text: resize text, if auto_size is enabled Change the default for auto_size to false, so that it is not automatically resized during construction. --- src/menu/text.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/menu/text.cpp b/src/menu/text.cpp index 3c95b42b..0e2b07c9 100644 --- a/src/menu/text.cpp +++ b/src/menu/text.cpp @@ -34,7 +34,7 @@ namespace usdx Text::Text(Container *parent, const std::string text, const unsigned int size, const VerticalTextAlignment* valign) : - DrawableControl(parent), text(text), auto_size(true), + DrawableControl(parent), text(text), auto_size(false), stretch(false), offset(Point(0, 0)), valign(valign) { font = new FTBufferFont("DejaVuSans.ttf"); @@ -75,7 +75,9 @@ namespace usdx bbox.get_point2().set_y(font->Descender()); valign->align(offset, bbox, get_size()); - // TODO: handle autosize (required for sensitive area) + if (auto_size && get_size() != bbox.get_dim()) { + set_size(bbox.get_dim()); + } } void Text::draw(void) -- cgit v1.2.3