X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.cc;h=124431c5b461babdc79abab55686a92e18427beb;hb=b33e8f66129db596fcf22499c2abc7c4505a8f48;hp=4522a1c0c2f3037fbd8771f593f0f1145e375f6b;hpb=f6724de2a4592c8e706cab30750e2c697d6b6509;p=chaz%2Fopenbox diff --git a/otk/widget.cc b/otk/widget.cc index 4522a1c0..124431c5 100644 --- a/otk/widget.cc +++ b/otk/widget.cc @@ -296,11 +296,29 @@ void OtkWidget::adjustVert(void) int widest = 0; int height = _bevel_width; + OtkWidgetList stretchable; + for (it = _children.begin(); it != end; ++it) { tmp = *it; + if (tmp->isStretchableVert() && _fixed_height) + stretchable.push_back(tmp); + else + height += tmp->_rect.height() + _bevel_width; + if (tmp->_rect.width() > widest) widest = tmp->_rect.width(); - height += tmp->_rect.height() + _bevel_width; + } + + if (stretchable.size() > 0) { + OtkWidgetList::iterator str_it = stretchable.begin(), + str_end = stretchable.end(); + + int str_height = _rect.height() - height / stretchable.size(); + + for (; str_it != str_end; ++str_it) { + (*str_it)->setHeight(str_height - _bevel_width); + (*str_it)->update(); + } } OtkWidget *prev_widget = 0;