mirror of
https://github.com/classilla/tenfourfox.git
synced 2024-10-21 11:24:51 +00:00
closes #507: add button number equivalents to nsChildView
This commit is contained in:
parent
50093b1bfd
commit
41e8326d1b
@ -6055,7 +6055,7 @@ PanGestureTypeForEvent(NSEvent* aEvent)
|
|||||||
|
|
||||||
WidgetMouseEventBase* mouseEvent = outGeckoEvent->AsMouseEventBase();
|
WidgetMouseEventBase* mouseEvent = outGeckoEvent->AsMouseEventBase();
|
||||||
mouseEvent->buttons = 0;
|
mouseEvent->buttons = 0;
|
||||||
#if(0) // wtf, but this works.
|
#if(0)
|
||||||
NSUInteger mouseButtons = [NSEvent pressedMouseButtons];
|
NSUInteger mouseButtons = [NSEvent pressedMouseButtons];
|
||||||
|
|
||||||
if (mouseButtons & 0x01) {
|
if (mouseButtons & 0x01) {
|
||||||
@ -6074,7 +6074,6 @@ PanGestureTypeForEvent(NSEvent* aEvent)
|
|||||||
mouseEvent->buttons |= WidgetMouseEvent::e5thButtonFlag;
|
mouseEvent->buttons |= WidgetMouseEvent::e5thButtonFlag;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
switch ([aMouseEvent type]) {
|
switch ([aMouseEvent type]) {
|
||||||
case NSLeftMouseDown:
|
case NSLeftMouseDown:
|
||||||
case NSLeftMouseUp:
|
case NSLeftMouseUp:
|
||||||
@ -6085,11 +6084,28 @@ PanGestureTypeForEvent(NSEvent* aEvent)
|
|||||||
case NSOtherMouseDown:
|
case NSOtherMouseDown:
|
||||||
case NSOtherMouseUp:
|
case NSOtherMouseUp:
|
||||||
case NSOtherMouseDragged:
|
case NSOtherMouseDragged:
|
||||||
|
{
|
||||||
|
// pressedMouseButtons: doesn't exist in the 10.4 SDK, so use the
|
||||||
|
// additional code below (TenFourFox issue 507).
|
||||||
|
|
||||||
|
NSInteger mouseButtons = [aMouseEvent buttonNumber];
|
||||||
|
if (mouseButtons == 0)
|
||||||
|
mouseEvent->buttons |= WidgetMouseEvent::eLeftButtonFlag;
|
||||||
|
else if (mouseButtons == 1)
|
||||||
|
mouseEvent->buttons |= WidgetMouseEvent::eRightButtonFlag;
|
||||||
|
else if (mouseButtons == 2)
|
||||||
|
mouseEvent->buttons |= WidgetMouseEvent::eMiddleButtonFlag;
|
||||||
|
else if (mouseButtons == 3)
|
||||||
|
mouseEvent->buttons |= WidgetMouseEvent::e4thButtonFlag;
|
||||||
|
else if (mouseButtons >= 4) // WRONG! but close enough
|
||||||
|
mouseEvent->buttons |= WidgetMouseEvent::e5thButtonFlag;
|
||||||
|
|
||||||
if ([aMouseEvent subtype] == NSTabletPointEventSubtype) {
|
if ([aMouseEvent subtype] == NSTabletPointEventSubtype) {
|
||||||
mouseEvent->pressure = [aMouseEvent pressure];
|
mouseEvent->pressure = [aMouseEvent pressure];
|
||||||
MOZ_ASSERT(mouseEvent->pressure >= 0.0 && mouseEvent->pressure <= 1.0);
|
MOZ_ASSERT(mouseEvent->pressure >= 0.0 && mouseEvent->pressure <= 1.0);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
default:
|
default:
|
||||||
// Don't check other NSEvents for pressure.
|
// Don't check other NSEvents for pressure.
|
||||||
|
Loading…
Reference in New Issue
Block a user