From 4e9a2fec7758a64fe1b83bb0bb367a2b4c1913c7 Mon Sep 17 00:00:00 2001 From: Cary Sandvig Date: Fri, 30 Mar 2001 22:50:17 +0000 Subject: [PATCH] logic error --- panda/src/gui/guiManager.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/panda/src/gui/guiManager.cxx b/panda/src/gui/guiManager.cxx index 1d5473231e..b8a2b15b9b 100644 --- a/panda/src/gui/guiManager.cxx +++ b/panda/src/gui/guiManager.cxx @@ -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; }