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

Unified Diff: ui/views/controls/slider.h

Issue 2335513002: Adding ripple effect for clicks on MD slider (Closed)
Patch Set: improve animation in slider and address comments Created 4 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 side-by-side diff with in-line comments
Download patch
Index: ui/views/controls/slider.h
diff --git a/ui/views/controls/slider.h b/ui/views/controls/slider.h
index e90da3a4ab1ae20426f114e9c184a7dbd6d6bef5..61d522acce60397463eb626fb5512e830e01bc49 100644
--- a/ui/views/controls/slider.h
+++ b/ui/views/controls/slider.h
@@ -73,12 +73,17 @@ class VIEWS_EXPORT Slider : public View, public gfx::AnimationDelegate {
protected:
explicit Slider(SliderListener* listener);
+ virtual void SetHighlighted(bool is_highlighted) {}
tdanderson 2016/09/23 20:55:50 nit: Move the default (no-op) implementation {} in
yiyix 2016/09/23 21:39:57 Done.
// Returns the current position of the thumb on the slider.
float GetAnimatingValue() const;
virtual int GetThumbWidth() = 0;
+ // gfx::AnimationDelegate:
+ void AnimationProgressed(const gfx::Animation* animation) override;
+ void AnimationEnded(const gfx::Animation* animation) override;
varkha 2016/09/23 22:30:25 nit: methods here and in .cc should follow the ord
yiyix 2016/09/24 06:24:36 Done.
+
// views::View:
void OnPaint(gfx::Canvas* canvas) override;
@@ -117,9 +122,6 @@ class VIEWS_EXPORT Slider : public View, public gfx::AnimationDelegate {
// ui::EventHandler:
void OnGestureEvent(ui::GestureEvent* event) override;
- // gfx::AnimationDelegate:
- void AnimationProgressed(const gfx::Animation* animation) override;
-
void set_listener(SliderListener* listener) {
listener_ = listener;
}
@@ -130,7 +132,7 @@ class VIEWS_EXPORT Slider : public View, public gfx::AnimationDelegate {
float value_;
float keyboard_increment_;
- float animating_value_;
+ float initial_animating_value_;
bool value_is_valid_;
base::string16 accessible_name_;
bool accessibility_events_enabled_;

Powered by Google App Engine
This is Rietveld 408576698