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

Side by Side Diff: ui/views/controls/md_slider.h

Issue 2335513002: Adding ripple effect for clicks on MD slider (Closed)
Patch Set: add disallow_copy_and_assign to testslider Created 4 years, 2 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
« no previous file with comments | « no previous file | ui/views/controls/md_slider.cc » ('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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #ifndef UI_VIEWS_CONTROLS_MD_SLIDER_H_ 5 #ifndef UI_VIEWS_CONTROLS_MD_SLIDER_H_
6 #define UI_VIEWS_CONTROLS_MD_SLIDER_H_ 6 #define UI_VIEWS_CONTROLS_MD_SLIDER_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "ui/views/controls/slider.h" 9 #include "ui/views/controls/slider.h"
10 #include "ui/views/view.h" 10 #include "ui/views/view.h"
11 #include "ui/views/views_export.h" 11 #include "ui/views/views_export.h"
12 12
13 namespace gfx {
14 class SlideAnimation;
15 }
16
13 namespace views { 17 namespace views {
14 18
15 // TODO(yiyix): When material design is enabled by default, use 19 // TODO(yiyix): When material design is enabled by default, use
16 // MaterialDesignSlider as the default slider implementation. (crbug.com/614453) 20 // MdSlider as the default slider implementation. (crbug.com/614453)
17 class VIEWS_EXPORT MdSlider : public Slider { 21 class VIEWS_EXPORT MdSlider : public Slider {
18 public: 22 public:
19 explicit MdSlider(SliderListener* listener); 23 explicit MdSlider(SliderListener* listener);
20 ~MdSlider() override; 24 ~MdSlider() override;
21 25
22 // ui::Slider: 26 // ui::Slider:
23 void UpdateState(bool control_on) override; 27 void UpdateState(bool control_on) override;
24 28
25 // views::View: 29 // views::View:
26 void OnPaint(gfx::Canvas* canvas) override; 30 void OnPaint(gfx::Canvas* canvas) override;
27 const char* GetClassName() const override; 31 const char* GetClassName() const override;
28 32
29 protected: 33 protected:
30 // ui::Slider: 34 // ui::Slider:
31 int GetThumbWidth() override; 35 int GetThumbWidth() override;
36 void SetHighlighted(bool is_highlighted) override;
32 37
33 private: 38 private:
39 // gfx::AnimationDelegate:
40 void AnimationProgressed(const gfx::Animation* animation) override;
41 void AnimationEnded(const gfx::Animation* animation) override;
42
34 // Record whether the slider is in the active state or the disabled state. 43 // Record whether the slider is in the active state or the disabled state.
35 bool is_active_; 44 bool is_active_;
45
46 // Animating value of the current radius of the thumb's highlight.
47 float thumb_highlight_radius_;
48
49 std::unique_ptr<gfx::SlideAnimation> highlight_animation_;
50
51 DISALLOW_COPY_AND_ASSIGN(MdSlider);
36 }; 52 };
37 53
38 } // namespace views 54 } // namespace views
39 55
40 #endif // UI_VIEWS_CONTROLS_MD_SLIDER_H_ 56 #endif // UI_VIEWS_CONTROLS_MD_SLIDER_H_
OLDNEW
« no previous file with comments | « no previous file | ui/views/controls/md_slider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698