diff options
author | Sebastian Geerken <devnull@localhost> | 2015-01-03 14:11:43 +0100 |
---|---|---|
committer | Sebastian Geerken <devnull@localhost> | 2015-01-03 14:11:43 +0100 |
commit | e05ebd46d570cd64c116ed4bdde669ea0962e99b (patch) | |
tree | 6ddc9384dcac902ad8950877de447753e285ecb8 /dw | |
parent | 9b74c22aad29fe8c2b0de0c9683476fd078bfa4d (diff) | |
parent | eba615f8984b86bd6c1bce6fbadb8be58c39664a (diff) |
Merge with main repo.
Diffstat (limited to 'dw')
-rw-r--r-- | dw/ooffloatsmgr.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dw/ooffloatsmgr.cc b/dw/ooffloatsmgr.cc index 4025ab77..f3844577 100644 --- a/dw/ooffloatsmgr.cc +++ b/dw/ooffloatsmgr.cc @@ -1966,8 +1966,8 @@ void OOFFloatsMgr::getFloatsExtremes (Extremes *cbExtr, Side side, + max (containerAllocation.width - gba->width, 0)); } - DBG_OBJ_MSGF ("resize.oofm", 1, "%d + %d / %d => %d * %d", - x, extr.minWidth, extr.maxWidth, *minWidth, *maxWidth); + DBG_OBJ_MSGF ("resize.oofm", 1, "%d / %d => %d / %d", + extr.minWidth, extr.maxWidth, *minWidth, *maxWidth); } else DBG_OBJ_MSG ("resize.oofm", 1, "not allocated"); } |