wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 891316 part.3 Use widget::MSGResult in widget::MouseScrollHandler r=jimm

Browse Source
This commit is contained in:
Masayuki Nakano 2013-07-18 17:12:31 +09:00
parent 3d4828eccb
commit 81f395faeb
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
widget/windows/WinMouseScrollHandler.cpp
View File

@ -13,6 +13,7 @@
#include "WinMouseScrollHandler.h"
#include "nsWindow.h"
#include "nsWindowDefs.h"
#include "KeyboardLayout.h"
#include "WinUtils.h"
#include "nsGkAtoms.h"
@ -150,7 +151,7 @@ MouseScrollHandler::~MouseScrollHandler()
bool
MouseScrollHandler::ProcessMessage(nsWindow* aWindow, UINT msg,
WPARAM wParam, LPARAM lParam,
LRESULT *aRetValue, bool &aEatMessage)
MSGResult& aResult)
{
Device::Elantech::UpdateZoomUntil();
@ -174,16 +175,16 @@ MouseScrollHandler::ProcessMessage(nsWindow* aWindow, UINT msg,
// WM_MOUSEHWHEEL. We should consume them always. If the messages
// would be handled by our window again, it caused making infinite
// message loop.
aEatMessage = true;
*aRetValue = (msg != WM_MOUSEHWHEEL);
aResult.mConsumed = true;
aResult.mResult = (msg != WM_MOUSEHWHEEL);
return true;
case WM_HSCROLL:
case WM_VSCROLL:
aEatMessage =
aResult.mConsumed =
GetInstance()->ProcessNativeScrollMessage(aWindow, msg, wParam, lParam);
sInstance->mSynthesizingEvent->NotifyNativeMessageHandlingFinished();
*aRetValue = 0;
aResult.mResult = 0;
return true;
case MOZ_WM_MOUSEVWHEEL:
@ -191,7 +192,7 @@ MouseScrollHandler::ProcessMessage(nsWindow* aWindow, UINT msg,
GetInstance()->HandleMouseWheelMessage(aWindow, msg, wParam, lParam);
sInstance->mSynthesizingEvent->NotifyInternalMessageHandlingFinished();
// Doesn't need to call next wndproc for internal wheel message.
aEatMessage = true;
aResult.mConsumed = true;
return true;
case MOZ_WM_HSCROLL:
@ -200,7 +201,7 @@ MouseScrollHandler::ProcessMessage(nsWindow* aWindow, UINT msg,
HandleScrollMessageAsMouseWheelMessage(aWindow, msg, wParam, lParam);
sInstance->mSynthesizingEvent->NotifyInternalMessageHandlingFinished();
// Doesn't need to call next wndproc for internal scroll message.
aEatMessage = true;
aResult.mConsumed = true;
return true;
case WM_KEYDOWN:
@ -213,8 +214,8 @@ MouseScrollHandler::ProcessMessage(nsWindow* aWindow, UINT msg,
::GetMessageTime()));
LOG_KEYSTATE();
if (Device::Elantech::HandleKeyMessage(aWindow, msg, wParam)) {
*aRetValue = 0;
aEatMessage = true;
aResult.mResult = 0;
aResult.mConsumed = true;
return true;
}
return false;

5
widget/windows/WinMouseScrollHandler.h
View File

@ -23,6 +23,8 @@ namespace widget {
class ModifierKeyState;
class WheelEvent;
struct MSGResult;
class MouseScrollHandler {
public:
static MouseScrollHandler* GetInstance();
@ -34,8 +36,7 @@ public:
UINT msg,
WPARAM wParam,
LPARAM lParam,
LRESULT *aRetValue,
bool &aEatMessage);
MSGResult& aResult);
/**
* See nsIWidget::SynthesizeNativeMouseScrollEvent() for the detail about

2
widget/windows/nsWindow.cpp
View File

@ -4438,7 +4438,7 @@ nsWindow::ExternalHandlerProcessMessage(UINT aMessage,
}
if (MouseScrollHandler::ProcessMessage(this, aMessage, aWParam, aLParam,
&aResult.mResult, aResult.mConsumed)) {
aResult)) {
return true;
}