Changeset 20924

Show
Ignore:
Timestamp:
11/18/07 03:40:12 (1 year ago)
Author:
patrick
Message:

Backed out more of r20922. All that was supposed to change in that revision
was the removal of mX and mY.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/modules/gadgeteer/gadget/Devices/KeyboardMouseDevice/InputAreaCocoa.mm

    r20923 r20924  
    129129                                         NSEvent* event) 
    130130{ 
    131    const NSPoint view_loc = [event locationInWindow]; 
     131   const NSPoint view_loc = [mMainView convertPoint:[event locationInWindow] 
     132                                           fromView:nil]; 
    132133   const NSPoint root_loc = [NSEvent mouseLocation]; 
    133134   gadget::EventPtr mouse_event(new gadget::MouseEvent(type, button, 
    …… 
    142143void InputAreaCocoa::addMouseMoveEvent(NSEvent* event) 
    143144{ 
    144    const NSPoint view_loc = [event locationInWindow]; 
     145   const NSPoint view_loc = [mMainView convertPoint:[event locationInWindow] 
     146                                           fromView:nil]; 
    145147   const NSPoint root_loc = [NSEvent mouseLocation]; 
    146148   gadget::EventPtr move_event(new gadget::MouseEvent(gadget::MouseMoveEvent,