From 860c144735d33d2cc10efe4e0337dbf4b36ed9da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 24 Nov 2005 16:39:19 +0000 Subject: [PATCH] No longer checks if there is already a "be:transit" item in the message; there should never be one (at least not a valid one). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15125 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/Window.cpp | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp index 4158923abf..6f77cf0da4 100644 --- a/src/kits/interface/Window.cpp +++ b/src/kits/interface/Window.cpp @@ -2597,27 +2597,25 @@ BWindow::_SanitizeMessage(BMessage* message, BHandler* target, bool usePreferred (void**)&handler) == B_OK) viewUnderMouse = dynamic_cast(handler); } - + // add transit information int32 transit; - if (message->FindInt32("be:transit", &transit) != B_OK) { - if (viewUnderMouse == view) { - // the mouse is over the target view - if (fLastMouseMovedView != view) - transit = B_ENTERED_VIEW; - else - transit = B_INSIDE_VIEW; - } else { - // the mouse is not over the target view - if (view == fLastMouseMovedView) - transit = B_EXITED_VIEW; - else - transit = B_OUTSIDE_VIEW; - } - - message->AddInt32("be:transit", transit); + if (viewUnderMouse == view) { + // the mouse is over the target view + if (fLastMouseMovedView != view) + transit = B_ENTERED_VIEW; + else + transit = B_INSIDE_VIEW; + } else { + // the mouse is not over the target view + if (view == fLastMouseMovedView) + transit = B_EXITED_VIEW; + else + transit = B_OUTSIDE_VIEW; } + message->AddInt32("be:transit", transit); + if (usePreferred || viewUnderMouse == NULL) fLastMouseMovedView = viewUnderMouse; }