X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.cc;h=30d147c8387953b61f55cbc095bac4d442f22e79;hb=361303715b6eb54d77ed8e1c9ad8f35e44e4ede1;hp=690224d897d7c13124cda435d717503ff1724fe0;hpb=555facb9c737be20cd923abc15875af0281a8927;p=chaz%2Fopenbox diff --git a/otk/widget.cc b/otk/widget.cc index 690224d8..30d147c8 100644 --- a/otk/widget.cc +++ b/otk/widget.cc @@ -89,7 +89,7 @@ void Widget::show(bool children) _visible = true; if (_parent) _parent->calcDefaultSizes(); else { - resize(_min_size); + resize(_area.size()); } XMapWindow(**display, _window); update(); @@ -230,12 +230,14 @@ void Widget::calcDefaultSizes() } } if (_direction == Horizontal) { - _min_size = otk::Size(min_sum, min_biggest + (_bevel + _borderwidth) * 2); + _min_size = otk::Size(min_sum + (_bevel + _borderwidth) * 2, + min_biggest + (_bevel + _borderwidth) * 2); _max_size = otk::Size((fullmax ? INT_MAX : max_sum + (_bevel + _borderwidth) * 2), max_biggest); } else { - _min_size = otk::Size(min_biggest, min_sum + (_bevel + _borderwidth) * 2); + _min_size = otk::Size(min_biggest + (_bevel + _borderwidth) * 2, + min_sum + (_bevel + _borderwidth) * 2); _max_size = otk::Size(max_biggest, (fullmax ? INT_MAX : max_sum + (_bevel + _borderwidth) * 2)); }