diff options
author | Sebastian Geerken <devnull@localhost> | 2014-10-03 13:51:25 +0200 |
---|---|---|
committer | Sebastian Geerken <devnull@localhost> | 2014-10-03 13:51:25 +0200 |
commit | 8fd2ae404f3f0af087217ba79ff9a35955fb026f (patch) | |
tree | bc42c1fbbb2224a52846d62111e5924ec788d0fc /dw/widget.cc | |
parent | 59b3ae08f3fcd91c0792e2ea840d0072f1d73416 (diff) | |
parent | 5f1cf298395601f67afc9aff78e547d915663daf (diff) |
Merge with main repo. (But something is not working yet.)
Diffstat (limited to 'dw/widget.cc')
-rw-r--r-- | dw/widget.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/dw/widget.cc b/dw/widget.cc index 19083f61..553439ff 100644 --- a/dw/widget.cc +++ b/dw/widget.cc @@ -608,9 +608,6 @@ int Widget::getAvailWidth (bool forceValue) DBG_OBJ_MSG_END (); } - if (width != -1) - width = misc::max (width, getMinWidth (NULL, forceValue)); - DBG_OBJ_MSGF ("resize", 1, "=> %d", width); DBG_OBJ_LEAVE (); @@ -1553,9 +1550,6 @@ int Widget::getAvailWidthOfChild (Widget *child, bool forceValue) } } - if (width != -1) - width = misc::max (width, child->getMinWidth (NULL, forceValue)); - DBG_OBJ_MSGF ("resize", 1, "=> %d", width); DBG_OBJ_LEAVE (); |