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

Side by Side Diff: ui/views/controls/button/custom_button.cc

Issue 10912063: events: Get rid of GestureStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « ui/views/controls/button/custom_button.h ('k') | ui/views/controls/button/menu_button.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/views/controls/button/custom_button.h" 5 #include "ui/views/controls/button/custom_button.h"
6 6
7 #include "ui/base/accessibility/accessible_view_state.h" 7 #include "ui/base/accessibility/accessible_view_state.h"
8 #include "ui/base/animation/throb_animation.h" 8 #include "ui/base/animation/throb_animation.h"
9 #include "ui/base/event.h" 9 #include "ui/base/event.h"
10 #include "ui/base/keycodes/keyboard_codes.h" 10 #include "ui/base/keycodes/keyboard_codes.h"
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 SetState(BS_NORMAL); 197 SetState(BS_NORMAL);
198 // TODO(beng): remove once NotifyClick takes ui::Event. 198 // TODO(beng): remove once NotifyClick takes ui::Event.
199 ui::MouseEvent synthetic_event(ui::ET_MOUSE_RELEASED, 199 ui::MouseEvent synthetic_event(ui::ET_MOUSE_RELEASED,
200 gfx::Point(), 200 gfx::Point(),
201 gfx::Point(), 201 gfx::Point(),
202 ui::EF_LEFT_MOUSE_BUTTON); 202 ui::EF_LEFT_MOUSE_BUTTON);
203 NotifyClick(synthetic_event); 203 NotifyClick(synthetic_event);
204 return true; 204 return true;
205 } 205 }
206 206
207 ui::GestureStatus CustomButton::OnGestureEvent(const ui::GestureEvent& event) { 207 ui::EventResult CustomButton::OnGestureEvent(const ui::GestureEvent& event) {
208 if (state_ == BS_DISABLED) 208 if (state_ == BS_DISABLED)
209 return Button::OnGestureEvent(event); 209 return Button::OnGestureEvent(event);
210 210
211 if (event.type() == ui::ET_GESTURE_TAP && IsTriggerableEvent(event)) { 211 if (event.type() == ui::ET_GESTURE_TAP && IsTriggerableEvent(event)) {
212 // Set the button state to hot and start the animation fully faded in. The 212 // Set the button state to hot and start the animation fully faded in. The
213 // TAP_UP event issued immediately after will set the state to BS_NORMAL 213 // TAP_UP event issued immediately after will set the state to BS_NORMAL
214 // beginning the fade out animation. See http://crbug.com/131184. 214 // beginning the fade out animation. See http://crbug.com/131184.
215 SetState(BS_HOT); 215 SetState(BS_HOT);
216 hover_animation_->Reset(1.0); 216 hover_animation_->Reset(1.0);
217 NotifyClick(event); 217 NotifyClick(event);
218 return ui::GESTURE_STATUS_CONSUMED; 218 return ui::ER_CONSUMED;
219 } else if (event.type() == ui::ET_GESTURE_TAP_DOWN && 219 } else if (event.type() == ui::ET_GESTURE_TAP_DOWN &&
220 ShouldEnterPushedState(event)) { 220 ShouldEnterPushedState(event)) {
221 SetState(BS_PUSHED); 221 SetState(BS_PUSHED);
222 if (request_focus_on_press_) 222 if (request_focus_on_press_)
223 RequestFocus(); 223 RequestFocus();
224 return ui::GESTURE_STATUS_CONSUMED; 224 return ui::ER_CONSUMED;
225 } else { 225 } else {
226 SetState(BS_NORMAL); 226 SetState(BS_NORMAL);
227 } 227 }
228 return Button::OnGestureEvent(event); 228 return Button::OnGestureEvent(event);
229 } 229 }
230 230
231 bool CustomButton::AcceleratorPressed(const ui::Accelerator& accelerator) { 231 bool CustomButton::AcceleratorPressed(const ui::Accelerator& accelerator) {
232 SetState(BS_NORMAL); 232 SetState(BS_NORMAL);
233 /* 233 /*
234 ui::KeyEvent key_event(ui::ET_KEY_RELEASED, accelerator.key_code(), 234 ui::KeyEvent key_event(ui::ET_KEY_RELEASED, accelerator.key_code(),
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 if (!is_add && state_ != BS_DISABLED) 320 if (!is_add && state_ != BS_DISABLED)
321 SetState(BS_NORMAL); 321 SetState(BS_NORMAL);
322 } 322 }
323 323
324 void CustomButton::OnBlur() { 324 void CustomButton::OnBlur() {
325 if (IsHotTracked()) 325 if (IsHotTracked())
326 SetState(BS_NORMAL); 326 SetState(BS_NORMAL);
327 } 327 }
328 328
329 } // namespace views 329 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/button/custom_button.h ('k') | ui/views/controls/button/menu_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698