OLD | NEW |
---|---|
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 #include "ui/wm/core/accelerator_filter.h" | 5 #include "ui/wm/core/accelerator_filter.h" |
6 | 6 |
7 #include "ui/base/accelerators/accelerator.h" | 7 #include "ui/base/accelerators/accelerator.h" |
8 #include "ui/base/accelerators/accelerator_history.h" | 8 #include "ui/base/accelerators/accelerator_history.h" |
9 #include "ui/events/event.h" | 9 #include "ui/events/event.h" |
10 #include "ui/wm/core/accelerator_delegate.h" | 10 #include "ui/wm/core/accelerator_delegate.h" |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
64 accelerator_history_->StoreCurrentAccelerator(accelerator); | 64 accelerator_history_->StoreCurrentAccelerator(accelerator); |
65 | 65 |
66 AcceleratorDelegate::KeyType key_type = | 66 AcceleratorDelegate::KeyType key_type = |
67 IsSystemKey(event->key_code()) ? AcceleratorDelegate::KEY_TYPE_SYSTEM | 67 IsSystemKey(event->key_code()) ? AcceleratorDelegate::KEY_TYPE_SYSTEM |
68 : AcceleratorDelegate::KEY_TYPE_OTHER; | 68 : AcceleratorDelegate::KEY_TYPE_OTHER; |
69 | 69 |
70 if (delegate_->ProcessAccelerator(*event, accelerator, key_type)) | 70 if (delegate_->ProcessAccelerator(*event, accelerator, key_type)) |
71 event->StopPropagation(); | 71 event->StopPropagation(); |
72 } | 72 } |
73 | 73 |
74 void AcceleratorFilter::OnMouseEvent(ui::MouseEvent* event) { | |
75 // When a mouse event is interleaved between two key accelerators, we must | |
76 // clear the current accelerator in the accelerator history by setting it to | |
77 // a default empty key accelerator. | |
sadrul
2015/05/01 03:21:18
Interesting! Would it be possible to write a test
afakhry
2015/05/02 00:02:42
I don't this will create any issues. There are onl
| |
78 accelerator_history_->StoreCurrentAccelerator(ui::Accelerator()); | |
79 } | |
80 | |
74 ui::Accelerator CreateAcceleratorFromKeyEvent(const ui::KeyEvent& key_event) { | 81 ui::Accelerator CreateAcceleratorFromKeyEvent(const ui::KeyEvent& key_event) { |
75 const int kModifierFlagMask = | 82 const int kModifierFlagMask = |
76 (ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN); | 83 (ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN); |
77 | 84 |
78 ui::Accelerator accelerator(key_event.key_code(), | 85 ui::Accelerator accelerator(key_event.key_code(), |
79 key_event.flags() & kModifierFlagMask); | 86 key_event.flags() & kModifierFlagMask); |
80 if (key_event.type() == ui::ET_KEY_RELEASED) | 87 if (key_event.type() == ui::ET_KEY_RELEASED) |
81 accelerator.set_type(ui::ET_KEY_RELEASED); | 88 accelerator.set_type(ui::ET_KEY_RELEASED); |
82 accelerator.set_is_repeat(key_event.IsRepeat()); | 89 accelerator.set_is_repeat(key_event.IsRepeat()); |
83 return accelerator; | 90 return accelerator; |
84 } | 91 } |
85 | 92 |
86 } // namespace wm | 93 } // namespace wm |
OLD | NEW |