From 8a89ce7e9315aa81abf4701b8e03ce40a9500e69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 9 Oct 2008 09:50:58 +0000 Subject: [PATCH] * WorkspacesView::MouseDown() now only reacts on mouse buttons within the view even if the auto raise feature is activated. This fixes bug #2173. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27938 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/workspaces/Workspaces.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/apps/workspaces/Workspaces.cpp b/src/apps/workspaces/Workspaces.cpp index 140438a50e..294f9fab9c 100644 --- a/src/apps/workspaces/Workspaces.cpp +++ b/src/apps/workspaces/Workspaces.cpp @@ -379,7 +379,7 @@ void WorkspacesView::MouseMoved(BPoint where, uint32 transit, const BMessage* dragMessage) { - if (Window() == NULL || EventMask() == 0) + if (dynamic_cast(Window()) == NULL || EventMask() == 0) return; // Auto-Raise @@ -399,6 +399,11 @@ WorkspacesView::MouseMoved(BPoint where, uint32 transit, void WorkspacesView::MouseDown(BPoint where) { + // With enabled auto-raise feature, we'll get mouse messages we don't + // want to handle here. + if (!Bounds().Contains(where)) + return; + int32 buttons = 0; if (Window() != NULL && Window()->CurrentMessage() != NULL) Window()->CurrentMessage()->FindInt32("buttons", &buttons);