Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(737)

Side by Side Diff: ui/views/event_monitor_mac.mm

Issue 1747803003: MacViews: Implement Tab Dragging (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "ui/views/event_monitor_mac.h" 5 #import "ui/views/event_monitor_mac.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "ui/events/event.h" 10 #include "ui/events/event.h"
11 #include "ui/events/event_handler.h" 11 #include "ui/events/event_handler.h"
12 #include "ui/events/event_utils.h" 12 #include "ui/events/event_utils.h"
13 #include "ui/gfx/screen.h"
13 14
14 namespace views { 15 namespace views {
15 16
16 // static 17 // static
17 scoped_ptr<EventMonitor> EventMonitor::CreateApplicationMonitor( 18 scoped_ptr<EventMonitor> EventMonitor::CreateApplicationMonitor(
18 ui::EventHandler* event_handler) { 19 ui::EventHandler* event_handler) {
19 return make_scoped_ptr(new EventMonitorMac(event_handler, nullptr)); 20 return make_scoped_ptr(new EventMonitorMac(event_handler, nullptr));
20 } 21 }
21 22
22 // static 23 // static
23 scoped_ptr<EventMonitor> EventMonitor::CreateWindowMonitor( 24 scoped_ptr<EventMonitor> EventMonitor::CreateWindowMonitor(
24 ui::EventHandler* event_handler, 25 ui::EventHandler* event_handler,
25 gfx::NativeWindow target_window) { 26 gfx::NativeWindow target_window) {
26 return make_scoped_ptr(new EventMonitorMac(event_handler, target_window)); 27 return make_scoped_ptr(new EventMonitorMac(event_handler, target_window));
27 } 28 }
28 29
29 // static 30 // static
30 gfx::Point EventMonitor::GetLastMouseLocation() { 31 gfx::Point EventMonitor::GetLastMouseLocation() {
31 NSPoint mouseLocation = [NSEvent mouseLocation]; 32 return gfx::Screen::GetScreen()->GetCursorScreenPoint();
tapted 2016/03/01 08:11:58 these refactorings are good,but they should land s
32 // Flip coordinates to gfx (0,0 in top-left corner) using primary screen.
33 NSScreen* screen = [[NSScreen screens] firstObject];
34 mouseLocation.y = NSMaxY([screen frame]) - mouseLocation.y;
35 return gfx::Point(mouseLocation.x, mouseLocation.y);
36 } 33 }
37 34
38 EventMonitorMac::EventMonitorMac(ui::EventHandler* event_handler, 35 EventMonitorMac::EventMonitorMac(ui::EventHandler* event_handler,
39 gfx::NativeWindow target_window) { 36 gfx::NativeWindow target_window) {
40 DCHECK(event_handler); 37 DCHECK(event_handler);
41 monitor_ = [NSEvent addLocalMonitorForEventsMatchingMask:NSAnyEventMask 38 monitor_ = [NSEvent addLocalMonitorForEventsMatchingMask:NSAnyEventMask
42 handler:^NSEvent*(NSEvent* event) { 39 handler:^NSEvent*(NSEvent* event) {
43 if (!target_window || [event window] == target_window) { 40 if (!target_window || [event window] == target_window) {
44 scoped_ptr<ui::Event> ui_event = ui::EventFromNative(event); 41 scoped_ptr<ui::Event> ui_event = ui::EventFromNative(event);
45 if (ui_event) 42 if (ui_event)
46 event_handler->OnEvent(ui_event.get()); 43 event_handler->OnEvent(ui_event.get());
47 } 44 }
48 return event; 45 return event;
49 }]; 46 }];
50 } 47 }
51 48
52 EventMonitorMac::~EventMonitorMac() { 49 EventMonitorMac::~EventMonitorMac() {
53 [NSEvent removeMonitor:monitor_]; 50 [NSEvent removeMonitor:monitor_];
54 } 51 }
55 52
56 } // namespace views 53 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698