From 514fcf3be9ba65665ea1221576b39133e1d406ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 15 Jul 2009 08:07:44 +0000 Subject: [PATCH] * Pass the mouse wheel message to our parent (ie. the next handler) if we don't have any scrollers. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31580 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/View.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/kits/interface/View.cpp b/src/kits/interface/View.cpp index 616b6843b0..fe3094c991 100644 --- a/src/kits/interface/View.cpp +++ b/src/kits/interface/View.cpp @@ -4167,18 +4167,22 @@ BView::MessageReceived(BMessage* msg) case B_MOUSE_WHEEL_CHANGED: { - float deltaX = 0.0f, deltaY = 0.0f; - BScrollBar* horizontal = ScrollBar(B_HORIZONTAL); + BScrollBar* vertical = ScrollBar(B_VERTICAL); + if (horizontal == NULL && vertical == NULL) { + // Pass the message to the next handler + BHandler::MessageReceived(msg); + break; + } + + float deltaX = 0.0f, deltaY = 0.0f; if (horizontal != NULL) msg->FindFloat("be:wheel_delta_x", &deltaX); - - BScrollBar* vertical = ScrollBar(B_VERTICAL); if (vertical != NULL) msg->FindFloat("be:wheel_delta_y", &deltaY); if (deltaX == 0.0f && deltaY == 0.0f) - return; + break; float smallStep, largeStep; if (horizontal != NULL) { @@ -4210,7 +4214,8 @@ BView::MessageReceived(BMessage* msg) } default: - return BHandler::MessageReceived(msg); + BHandler::MessageReceived(msg); + break; } return;