TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

logic error

Browse Source
This commit is contained in:
Cary Sandvig 2001-03-30 22:50:17 +00:00
parent 31773972b4
commit 4e9a2fec77
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/gui/guiManager.cxx
View File

@ -210,10 +210,8 @@ INLINE bool overlap(GuiRegion* a, GuiRegion* b) {
LVector4f av = a->get_frame();
LVector4f bv = b->get_frame();
if (in_range(av[0], bv[0], bv[1]) ||
in_range(av[1], bv[0], bv[1]) ||
in_range(av[2], bv[2], bv[3]) ||
in_range(av[3], bv[2], bv[3]))
if ((in_range(av[0], bv[0], bv[1]) || in_range(av[1], bv[0], bv[1])) &&
(in_range(av[2], bv[2], bv[3]) || in_range(av[3], bv[2], bv[3])))
return true;
return false;
}