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

Side by Side Diff: ui/events/cocoa/events_mac_unittest.mm

Issue 2025943003: MacViews: Treat Ctrl+LeftClick as RightClick on Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20160520-Enums-MakeThemInt-HeaderChanges-ROLLUP
Patch Set: ugh depends patchset Created 4 years, 6 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
« no previous file with comments | « ui/events/cocoa/cocoa_event_utils.mm ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/mac/scoped_cftyperef.h" 10 #include "base/mac/scoped_cftyperef.h"
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 // Caps + Left 146 // Caps + Left
147 NSEvent* caps = cocoa_test_event_utils::MouseEventWithType( 147 NSEvent* caps = cocoa_test_event_utils::MouseEventWithType(
148 NSLeftMouseUp, NSAlphaShiftKeyMask); 148 NSLeftMouseUp, NSAlphaShiftKeyMask);
149 EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_CAPS_LOCK_ON, EventFlagsFromNative(caps)); 149 EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_CAPS_LOCK_ON, EventFlagsFromNative(caps));
150 150
151 // Shift + Left 151 // Shift + Left
152 NSEvent* shift = cocoa_test_event_utils::MouseEventWithType(NSLeftMouseUp, 152 NSEvent* shift = cocoa_test_event_utils::MouseEventWithType(NSLeftMouseUp,
153 NSShiftKeyMask); 153 NSShiftKeyMask);
154 EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_SHIFT_DOWN, EventFlagsFromNative(shift)); 154 EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_SHIFT_DOWN, EventFlagsFromNative(shift));
155 155
156 // Ctrl + Left 156 // Ctrl + Left. Note we map this to a right click on Mac.
157 NSEvent* ctrl = cocoa_test_event_utils::MouseEventWithType(NSLeftMouseUp, 157 NSEvent* ctrl = cocoa_test_event_utils::MouseEventWithType(NSLeftMouseUp,
158 NSControlKeyMask); 158 NSControlKeyMask);
159 EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_CONTROL_DOWN, EventFlagsFromNative(ctrl)); 159 EXPECT_EQ(EF_RIGHT_MOUSE_BUTTON | EF_CONTROL_DOWN,
Nico 2016/06/02 11:22:45 Ctrl-left probably should be right without ctrl (?
tapted 2016/06/03 01:25:04 Done. I couldn't decide which :). If it was Cmd, o
160 EventFlagsFromNative(ctrl));
161
162 // Ctrl + Right. Remains a right click.
163 NSEvent* ctrl_right = cocoa_test_event_utils::MouseEventWithType(
164 NSRightMouseUp, NSControlKeyMask);
165 EXPECT_EQ(EF_RIGHT_MOUSE_BUTTON | EF_CONTROL_DOWN,
166 EventFlagsFromNative(ctrl_right));
160 167
161 // Alt + Left 168 // Alt + Left
162 NSEvent* alt = cocoa_test_event_utils::MouseEventWithType(NSLeftMouseUp, 169 NSEvent* alt = cocoa_test_event_utils::MouseEventWithType(NSLeftMouseUp,
163 NSAlternateKeyMask); 170 NSAlternateKeyMask);
164 EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_ALT_DOWN, EventFlagsFromNative(alt)); 171 EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_ALT_DOWN, EventFlagsFromNative(alt));
165 172
166 // Cmd + Left 173 // Cmd + Left
167 NSEvent* cmd = cocoa_test_event_utils::MouseEventWithType(NSLeftMouseUp, 174 NSEvent* cmd = cocoa_test_event_utils::MouseEventWithType(NSLeftMouseUp,
168 NSCommandKeyMask); 175 NSCommandKeyMask);
169 EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_COMMAND_DOWN, EventFlagsFromNative(cmd)); 176 EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_COMMAND_DOWN, EventFlagsFromNative(cmd));
170 177
171 // Shift + Ctrl + Left 178 // Shift + Ctrl + Left. Also mapped to a right-click.
172 NSEvent* shiftctrl = cocoa_test_event_utils::MouseEventWithType( 179 NSEvent* shiftctrl = cocoa_test_event_utils::MouseEventWithType(
173 NSLeftMouseUp, NSShiftKeyMask | NSControlKeyMask); 180 NSLeftMouseUp, NSShiftKeyMask | NSControlKeyMask);
174 EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_SHIFT_DOWN | EF_CONTROL_DOWN, 181 EXPECT_EQ(EF_RIGHT_MOUSE_BUTTON | EF_SHIFT_DOWN | EF_CONTROL_DOWN,
175 EventFlagsFromNative(shiftctrl)); 182 EventFlagsFromNative(shiftctrl));
176 183
177 // Cmd + Alt + Right 184 // Cmd + Alt + Right
178 NSEvent* cmdalt = cocoa_test_event_utils::MouseEventWithType( 185 NSEvent* cmdalt = cocoa_test_event_utils::MouseEventWithType(
179 NSLeftMouseUp, NSCommandKeyMask | NSAlternateKeyMask); 186 NSLeftMouseUp, NSCommandKeyMask | NSAlternateKeyMask);
180 EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_COMMAND_DOWN | EF_ALT_DOWN, 187 EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_COMMAND_DOWN | EF_ALT_DOWN,
181 EventFlagsFromNative(cmdalt)); 188 EventFlagsFromNative(cmdalt));
182 } 189 }
183 190
184 // Tests mouse button presses and mouse wheel events. 191 // Tests mouse button presses and mouse wheel events.
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 event = cocoa_test_event_utils::MouseEventWithType(NSMouseMoved, 0); 316 event = cocoa_test_event_utils::MouseEventWithType(NSMouseMoved, 0);
310 EXPECT_EQ(ui::ET_MOUSE_MOVED, ui::EventTypeFromNative(event)); 317 EXPECT_EQ(ui::ET_MOUSE_MOVED, ui::EventTypeFromNative(event));
311 318
312 event = cocoa_test_event_utils::EnterEvent(); 319 event = cocoa_test_event_utils::EnterEvent();
313 EXPECT_EQ(ui::ET_MOUSE_ENTERED, ui::EventTypeFromNative(event)); 320 EXPECT_EQ(ui::ET_MOUSE_ENTERED, ui::EventTypeFromNative(event));
314 event = cocoa_test_event_utils::ExitEvent(); 321 event = cocoa_test_event_utils::ExitEvent();
315 EXPECT_EQ(ui::ET_MOUSE_EXITED, ui::EventTypeFromNative(event)); 322 EXPECT_EQ(ui::ET_MOUSE_EXITED, ui::EventTypeFromNative(event));
316 } 323 }
317 324
318 } // namespace ui 325 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/cocoa/cocoa_event_utils.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698