diff options
| author | Sebastian Geerken <devnull@localhost> | 2014-12-08 17:45:17 +0100 |
|---|---|---|
| committer | Sebastian Geerken <devnull@localhost> | 2014-12-08 17:45:17 +0100 |
| commit | 5dbd6d012d9063a44979faf8499b71c82c194d93 (patch) | |
| tree | 13d589af237faa5de1e2c2cce787ff5c59a334a8 /dw/ooffloatsmgr.hh | |
| parent | 9b73df15f7fefd9221c3116bb89903a4018d00ec (diff) | |
Merged with main repo (part 2/2).
Diffstat (limited to 'dw/ooffloatsmgr.hh')
| -rw-r--r-- | dw/ooffloatsmgr.hh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dw/ooffloatsmgr.hh b/dw/ooffloatsmgr.hh index f847d614..86bf62da 100644 --- a/dw/ooffloatsmgr.hh +++ b/dw/ooffloatsmgr.hh @@ -295,7 +295,8 @@ private: core::Widget **interruptedWidget, int *index, int startIndex); - bool collidesV (Float *vloat, Float *other, SFVType type, int *yReal); + bool collidesV (Float *vloat, Float *other, SFVType type, int *yReal, + bool useAllocation); bool collidesH (Float *vloat, Float *other, SFVType type); void getFloatsListsAndSide (Float *vloat, SortedFloatsVector **listSame, |