mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-29 19:20:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for right and middle click on Skia/OSX port

Browse Source
This commit is contained in:
David Capello 2015-10-13 16:02:18 -03:00
parent f818dbc692
commit 15f4a16294
2 changed files with 74 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/she/osx/view.h
View File

@ -25,12 +25,21 @@
- (void)keyDown:(NSEvent*)event;
- (void)keyUp:(NSEvent*)event;
- (void)flagsChanged:(NSEvent*)event;
- (void)mouseDown:(NSEvent*)event;
- (void)mouseUp:(NSEvent*)event;
- (void)mouseEntered:(NSEvent*)event;
- (void)mouseMoved:(NSEvent*)event;
- (void)mouseExited:(NSEvent*)event;
- (void)mouseDown:(NSEvent*)event;
- (void)mouseUp:(NSEvent*)event;
- (void)mouseDragged:(NSEvent*)event;
- (void)rightMouseDown:(NSEvent*)event;
- (void)rightMouseUp:(NSEvent*)event;
- (void)rightMouseDragged:(NSEvent*)event;
- (void)otherMouseDown:(NSEvent*)event;
- (void)otherMouseUp:(NSEvent*)event;
- (void)otherMouseDragged:(NSEvent*)event;
- (void)handleMouseDown:(NSEvent*)event;
- (void)handleMouseUp:(NSEvent*)event;
- (void)handleMouseDragged:(NSEvent*)event;
- (void)setFrameSize:(NSSize)newSize;
- (void)createMouseTrackingArea;
- (void)destroyMouseTrackingArea;

81
src/she/osx/view.mm
View File

@ -283,24 +283,6 @@ inline Event::MouseButton get_mouse_buttons(NSEvent* event)
[super flagsChanged:event];
}
- (void)mouseDown:(NSEvent*)event
{
Event ev;
ev.setType(Event::MouseDown);
ev.setPosition(get_local_mouse_pos(self, event));
ev.setButton(Event::LeftButton);
queue_event(ev);
}
- (void)mouseUp:(NSEvent*)event
{
Event ev;
ev.setType(Event::MouseUp);
ev.setPosition(get_local_mouse_pos(self, event));
ev.setButton(Event::LeftButton);
queue_event(ev);
}
- (void)mouseEntered:(NSEvent*)event
{
Event ev;
@ -325,7 +307,70 @@ inline Event::MouseButton get_mouse_buttons(NSEvent* event)
queue_event(ev);
}
- (void)mouseDown:(NSEvent*)event
{
[self handleMouseDown:event];
}
- (void)mouseUp:(NSEvent*)event
{
[self handleMouseUp:event];
}
- (void)mouseDragged:(NSEvent*)event
{
[self handleMouseDragged:event];
}
- (void)rightMouseDown:(NSEvent*)event
{
[self handleMouseDown:event];
}
- (void)rightMouseUp:(NSEvent*)event
{
[self handleMouseUp:event];
}
- (void)rightMouseDragged:(NSEvent*)event
{
[self handleMouseDragged:event];
}
- (void)otherMouseDown:(NSEvent*)event
{
[self handleMouseDown:event];
}
- (void)otherMouseUp:(NSEvent*)event
{
[self handleMouseUp:event];
}
- (void)otherMouseDragged:(NSEvent*)event
{
[self handleMouseDragged:event];
}
- (void)handleMouseDown:(NSEvent*)event
{
Event ev;
ev.setType(Event::MouseDown);
ev.setPosition(get_local_mouse_pos(self, event));
ev.setButton(get_mouse_buttons(event));
queue_event(ev);
}
- (void)handleMouseUp:(NSEvent*)event
{
Event ev;
ev.setType(Event::MouseUp);
ev.setPosition(get_local_mouse_pos(self, event));
ev.setButton(get_mouse_buttons(event));
queue_event(ev);
}
- (void)handleMouseDragged:(NSEvent*)event
{
Event ev;
ev.setType(Event::MouseMove);