OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 <gtk/gtk.h> | 5 #include <gtk/gtk.h> |
6 | 6 |
7 #include "views/focus/accelerator_handler.h" | 7 #include "views/focus/accelerator_handler.h" |
8 | 8 |
9 #include "views/focus/focus_manager.h" | 9 #include "views/focus/focus_manager.h" |
10 #include "views/widget/widget_gtk.h" | 10 #include "views/widget/widget_gtk.h" |
(...skipping 25 matching lines...) Expand all Loading... |
36 gtk_main_do_event(event); | 36 gtk_main_do_event(event); |
37 return true; | 37 return true; |
38 } | 38 } |
39 FocusManager* focus_manager = widget->GetFocusManager(); | 39 FocusManager* focus_manager = widget->GetFocusManager(); |
40 if (!focus_manager) { | 40 if (!focus_manager) { |
41 NOTREACHED(); | 41 NOTREACHED(); |
42 return true; | 42 return true; |
43 } | 43 } |
44 | 44 |
45 if (event->type == GDK_KEY_PRESS) { | 45 if (event->type == GDK_KEY_PRESS) { |
46 KeyEvent view_key_event(key_event, true); | 46 KeyEvent view_key_event(key_event); |
47 // FocusManager::OnKeyPressed and OnKeyReleased return false if this | 47 // FocusManager::OnKeyPressed and OnKeyReleased return false if this |
48 // message has been consumed and should not be propagated further. | 48 // message has been consumed and should not be propagated further. |
49 if (!focus_manager->OnKeyEvent(view_key_event)) { | 49 if (!focus_manager->OnKeyEvent(view_key_event)) { |
50 last_key_pressed_ = key_event->keyval; | 50 last_key_pressed_ = key_event->keyval; |
51 return true; | 51 return true; |
52 } | 52 } |
53 } | 53 } |
54 | 54 |
55 // Key release, make sure to filter-out the key release for key press consumed | 55 // Key release, make sure to filter-out the key release for key press consumed |
56 // as accelerators to avoid unpaired key release. | 56 // as accelerators to avoid unpaired key release. |
57 if (event->type == GDK_KEY_RELEASE && | 57 if (event->type == GDK_KEY_RELEASE && |
58 key_event->keyval == last_key_pressed_) { | 58 key_event->keyval == last_key_pressed_) { |
59 last_key_pressed_ = 0; | 59 last_key_pressed_ = 0; |
60 return true; | 60 return true; |
61 } | 61 } |
62 | 62 |
63 gtk_main_do_event(event); | 63 gtk_main_do_event(event); |
64 return true; | 64 return true; |
65 } | 65 } |
66 | 66 |
67 } // namespace views | 67 } // namespace views |
OLD | NEW |