Modify the pure-views slider to reset on ESC.

ui/views/controls/slider.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/slider.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/widget/widget.h"
+#include "ui/base/accelerators/accelerator.h"

[sadrul, 2012/03/26 22:24:02]

sort

[rjkroege, 2012/04/03 19:24:21]

Done.

+
+#include <stdio.h>
 
 namespace {
 const int kSlideValueChangeDurationMS = 150;
 }
 
 namespace views {
 
 Slider::Slider(SliderListener* listener, Orientation orientation)
     : listener_(listener),
       orientation_(orientation),
       value_(0.f),
       animating_value_(0.f),
       value_is_valid_(false) {

[sadrul, 2012/03/26 22:24:02]

Initialize esc_was_pressed_

[rjkroege, 2012/04/03 19:24:21]

Done.

   EnableCanvasFlippingForRTLUI(true);
 }
 
 Slider::~Slider() {
 }
 
 void Slider::SetValue(float value) {
   SetValueInternal(value, VALUE_CHANGED_BY_API);
 }
 
@@ skipping 87 matching lines @@
 
   SkPaint paint;
   paint.setStyle(SkPaint::kFill_Style);
   paint.setAntiAlias(true);
   paint.setColor(kButtonColor);
   canvas->sk_canvas()->drawCircle(button_cx, button_cy, kButtonRadius, paint);
   View::OnPaint(canvas);
 }
 
 bool Slider::OnMousePressed(const views::MouseEvent& event) {
+  original_value_ = value_;
+  ui::Accelerator escape_accelerator(ui::VKEY_ESCAPE, false, false, false);
+  AddAccelerator(escape_accelerator);
   return OnMouseDragged(event);
 }
 
+void Slider::OnMouseReleased(const views::MouseEvent& event) {
+  esc_was_pressed_ = false;
+  ResetAccelerators();
+}
+
 bool Slider::OnMouseDragged(const views::MouseEvent& event) {
+  if (esc_was_pressed_)
+    return true;
   gfx::Insets inset = GetInsets();
   if (orientation_ == HORIZONTAL) {
     int amount = base::i18n::IsRTL() ? width() - inset.left() - event.x() :
                                        event.x() - inset.left();
     SetValueInternal(static_cast<float>(amount) / (width() - inset.width()),
                      VALUE_CHANGED_BY_USER);
   } else {
     SetValueInternal(1.0f - static_cast<float>(event.y()) / height(),
                      VALUE_CHANGED_BY_USER);
   }
   return true;
 }
 
 void Slider::AnimationProgressed(const ui::Animation* animation) {
   animating_value_ = animation->CurrentValueBetween(animating_value_, value_);
   SchedulePaint();
 }
 
 void Slider::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_SLIDER;
   state->name = accessible_name_;
   state->value = UTF8ToUTF16(
       base::StringPrintf("%d%%", (int)(value_ * 100 + 0.5)));
 }
 
+bool Slider::AcceleratorPressed(const ui::Accelerator& accelerator) {
+  SetValueInternal(original_value_, VALUE_CHANGED_BY_USER);
+  esc_was_pressed_ = true;
+  return true;
+}
+
 }  // namespace views